diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-28 12:51:49 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-28 12:51:49 +0200 |
commit | 9461103e4e88d652adbcd1790a21f087a1fccc53 (patch) | |
tree | 21c2df3684d2d6807344e480f9631871308049a6 /src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp | |
parent | 6f00d966b8f1f12e4c41cf0a3e189718d10fd43f (diff) | |
parent | b8845794b95376e8be39dbdafca2c85b5ec4c195 (diff) | |
download | qtscript-9461103e4e88d652adbcd1790a21f087a1fccc53.tar.gz |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I0a8e242e0c24a67fe60737674dc3a4ecf0936f3a
Diffstat (limited to 'src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp')
-rw-r--r-- | src/scripttools/debugging/qscriptdebuggerlocalswidget.cpp | 10 |
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; |