git.sur5r.net Git - bacula/bacula/blob - bacula/src/win32/patches/qt4-compilation.patch

   1 diff --git a/src/gui/widgets/qdialogbuttonbox.cpp b/src/gui/widgets/qdialogbuttonbox.cpp
   2 index b0f14ca..8e69e5f 100644 (file)
   3 --- a/src/gui/widgets/qdialogbuttonbox.cpp
   4 +++ b/src/gui/widgets/qdialogbuttonbox.cpp
   5 @@ -212,7 +212,7 @@ static QDialogButtonBox::ButtonRole roleFor(QDialogButtonBox::StandardButton but
   6      return QDialogButtonBox::InvalidRole;
   7  }
   8
   9 -static const int layouts[2][5][14] =
  10 +static const uint layouts[2][5][14] =
  11  {
  12      // Qt::Horizontal
  13      {
  14 @@ -407,7 +407,7 @@ void QDialogButtonBoxPrivate::layoutButtons()
  15              tmpPolicy = 4;  // Mac modeless
  16      }
  17
  18 -    const int *currentLayout = layouts[orientation == Qt::Vertical][tmpPolicy];
  19 +    const uint *currentLayout = layouts[orientation == Qt::Vertical][tmpPolicy];
  20
  21      if (center)
  22          buttonLayout->addStretch();
  23 diff --git a/src/opengl/gl2paintengineex/qtriangulator.cpp b/src/opengl/gl2paintengineex/qtriangulator.cpp
  24 index 3e9dbb8..e8d7db5 100644 (file)
  25 --- a/src/opengl/gl2paintengineex/qtriangulator.cpp
  26 +++ b/src/opengl/gl2paintengineex/qtriangulator.cpp
  27 @@ -1710,7 +1710,7 @@ void QTriangulator<T>::ComplexToSimple::initEdges()
  28          } else {
  29              Q_ASSERT(i + 1 < m_parent->m_indices.size());
  30              // {node, from, to, next, previous, winding, mayIntersect, pointingUp, originallyPointingUp}
  31 -            Edge edge = {0, m_parent->m_indices.at(i), m_parent->m_indices.at(i + 1), -1, -1, 0, true, false, false};
  32 +            Edge edge = {0, int(m_parent->m_indices.at(i)), int(m_parent->m_indices.at(i + 1)), -1, -1, 0, true, false, false};
  33              m_edges.add(edge);
  34          }
  35      }
  36 --- ./src/plugins/accessible/widgets/itemviews.cpp      2018-04-11 19:01:29.073721147 +0000
  37 +++ /home/bsbuild/dev/git/depkgs-mingw32/src/qt-everywhere-opensource-src-4.8.4/src/plugins/accessible/widgets/itemviews.cpp 2012-11-23 10:09:55.000000000 +0000
  38 @@ -393,7 +393,7 @@
  39      QModelIndex index = view()->model()->index(0, column, view()->rootIndex());
  40      if (!index.isValid() || view()->selectionMode() & QAbstractItemView::NoSelection)
  41          return false;
  42 -    view()->selectionModel()->select(index, QItemSelectionModel::Columns & QItemSelectionModel::Deselect);
  43 +    view()->selectionModel()->select(index, (QItemSelectionModel::SelectionFlag)(QItemSelectionModel::Columns & QItemSelectionModel::Deselect));
  44      return true;
  45  }