Merge pull request #519 from f3nix/qt5-warnings-1

Fix some Qt5 build warnings
FreeCAD · Feb 12, 2017 · ec00893 · ec00893
2 parents d925db1 + d7541bc
commit ec00893
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/Gui/DAGView/DAGRectItem.cpp b/src/Gui/DAGView/DAGRectItem.cpp
@@ -46,7 +46,11 @@ void RectItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* option,
   Q_UNUSED(widget); 
   painter->save();
 
+#if QT_VERSION >= 0x050000
+  QStyleOptionViewItem styleOption;
+#else
   QStyleOptionViewItemV4 styleOption;
+#endif
 
   styleOption.backgroundBrush = backgroundBrush;
   if (editing)

diff --git a/src/Mod/Sketcher/Gui/TaskSketcherConstrains.cpp b/src/Mod/Sketcher/Gui/TaskSketcherConstrains.cpp
@@ -320,7 +320,11 @@ class ExpressionDelegate : public QStyledItemDelegate
     }
 
     void paint ( QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const {
+#if QT_VERSION >= 0x050000
+        QStyleOptionViewItem options = option;
+#else
         QStyleOptionViewItemV4 options = option;
+#endif
         initStyleOption(&options, index);
 
         options.widget->style()->drawControl(QStyle::CE_ItemViewItem, &options, painter);