Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h
One side narrowed a QNX define to Dinkum; the other wanted the same
kludges applied for Intel.  Combine their changes to the condition.

Change-Id: Id44102e53a0f96b7318437fb47fa76d8bc1119f3

1 files changed, 1 insertions, 9 deletions

diff --git a/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp b/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp
index e902021..0425f5a 100644
--- a/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp
@@ -217,14 +217,6 @@ private Q_SLOTS:
         pal.setColor(QPalette::Active, QPalette::Base, col);
         editor->setPalette(pal);
     }
-
-private:
-    static const QWidget *widget(const QStyleOptionViewItem &option)
-    {
-        if (const QStyleOptionViewItemV3 *v3 = qstyleoption_cast<const QStyleOptionViewItemV3 *>(&option))
-            return v3->widget;
-        return 0;
-    }
 };
 
 QScriptDebuggerLocalsItemDelegate::QScriptDebuggerLocalsItemDelegate(
@@ -306,7 +298,7 @@ void QScriptDebuggerLocalsItemDelegate::paint(QPainter *painter, const QStyleOpt
         QStyledItemDelegate::paint(painter, option, index);
     } else {
         // this is a top-level item.
-        const QTreeView *view = qobject_cast<const QTreeView*>(widget(option));
+        const QTreeView *view = qobject_cast<const QTreeView*>(option.widget);
         Q_ASSERT(view != 0);
 
         QStyleOptionButton buttonOption;