diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-11-27 11:50:56 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-11-27 11:50:56 +0100 |
| commit | ba1d5f2cdf7d31eb862f02bd42885cdba13a7f15 (patch) | |
| tree | 5c9d0551e67612724a2ca0328636b091653c1f00 /src/plugins/debugger/qml/qmlinspectoradapter.h | |
| parent | c384f52b49f0eddc7a7f8e622e1485ebb1018028 (diff) | |
| parent | deeef5308f1b3d59581aa1a65e781d434719a40d (diff) | |
| download | qt-creator-ba1d5f2cdf7d31eb862f02bd42885cdba13a7f15.tar.gz | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
share/share.qbs
src/plugins/cpptools/cppchecksymbols.cpp
src/plugins/texteditor/behaviorsettingswidget.cpp
Change-Id: Ia34060984f9c036b2f28a6411d796d41f55a3e37
Diffstat (limited to 'src/plugins/debugger/qml/qmlinspectoradapter.h')
| -rw-r--r-- | src/plugins/debugger/qml/qmlinspectoradapter.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/debugger/qml/qmlinspectoradapter.h b/src/plugins/debugger/qml/qmlinspectoradapter.h index 11833e3173..9f8e76032e 100644 --- a/src/plugins/debugger/qml/qmlinspectoradapter.h +++ b/src/plugins/debugger/qml/qmlinspectoradapter.h @@ -96,6 +96,7 @@ private slots: void onReload(); void onReloaded(); void onDestroyedObject(int); + void jumpToObjectDefinitionInEditor(const QmlDebug::FileReference &objSource); private: void setActiveEngineClient(QmlDebug::BaseEngineDebugClient *client); @@ -103,8 +104,6 @@ private: void initializePreviews(); void showConnectionStatusMessage(const QString &message); - void gotoObjectReferenceDefinition(const QmlDebug::FileReference &objSource); - enum SelectionTarget { NoTarget, ToolTarget, EditorTarget }; void selectObject( const QmlDebug::ObjectReference &objectReference, |