diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2012-08-07 11:26:37 +1000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-16 07:24:06 +0200 |
commit | f21e9ba6efa2b1c8169491db271f79b87b5b0ce4 (patch) | |
tree | 6eabf1ad37e12247f210e3fe77f64abf6255aa56 /src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.h | |
parent | cc39a7d7affe37741292989c634aec3f60660c0e (diff) |
Remove interim compatibility measures
Also update some variables in qtdeclarative which failed to update
rootItem->contentItem.
Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d3
Reviewed-by: Alan Alpert <416365416c@gmail.com>
Diffstat (limited to 'src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.h')
-rw-r--r-- | src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.h b/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.h index dabb41e549..5c480697af 100644 --- a/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.h +++ b/src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.h @@ -108,7 +108,7 @@ private: bool m_pinchStarted; bool m_didPressAndHold; bool m_tapEvent; - QPointer<QQuickItem> m_rootItem; + QPointer<QQuickItem> m_contentItem; QPointF m_dragStartPosition; QPointF m_mousePosition; QPointF m_originalPosition; |