diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-11-30 16:38:22 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-11-30 17:02:35 +0100 |
| commit | d719eebfdc6cf4d2a97b4273f36e58d321a13a59 (patch) | |
| tree | 6e6092c9cf0660eb08c7c867e3d6c541b0b25d1e /src/plugins/debugger/qml/qmlinspectoradapter.h | |
| parent | 61c3de01a801241911e2469784e3dad8374d2121 (diff) | |
| parent | de4fd54c7629c164cc2871590b64c6d63c6c18b4 (diff) | |
| download | qt-creator-d719eebfdc6cf4d2a97b4273f36e58d321a13a59.tar.gz | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
src/plugins/coreplugin/editormanager/openeditorsview.cpp
src/plugins/debugger/qml/qmlengine.cpp
src/plugins/debugger/qml/qmlinspectoradapter.cpp
src/plugins/qtsupport/exampleslistmodel.cpp
src/plugins/qtsupport/exampleslistmodel.h
src/plugins/welcome/welcomeplugin.cpp
Change-Id: I92b542af23ceb7cf7dac84b12439e5f819f2dc39
Diffstat (limited to 'src/plugins/debugger/qml/qmlinspectoradapter.h')
| -rw-r--r-- | src/plugins/debugger/qml/qmlinspectoradapter.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/plugins/debugger/qml/qmlinspectoradapter.h b/src/plugins/debugger/qml/qmlinspectoradapter.h index 9f8e76032e..abaa62e4ab 100644 --- a/src/plugins/debugger/qml/qmlinspectoradapter.h +++ b/src/plugins/debugger/qml/qmlinspectoradapter.h @@ -81,7 +81,6 @@ private slots: void toolsClientStatusChanged(QmlDebug::ClientStatus status); void engineClientStatusChanged(QmlDebug::ClientStatus status); - void selectObjectsFromEditor(const QList<int> &debugIds); void selectObjectsFromToolsClient(const QList<int> &debugIds); void onObjectFetched(const QmlDebug::ObjectReference &ref); @@ -96,7 +95,7 @@ private slots: void onReload(); void onReloaded(); void onDestroyedObject(int); - void jumpToObjectDefinitionInEditor(const QmlDebug::FileReference &objSource); + void jumpToObjectDefinitionInEditor(const QmlDebug::FileReference &objSource, int debugId = -1); private: void setActiveEngineClient(QmlDebug::BaseEngineDebugClient *client); @@ -129,8 +128,6 @@ private: QHash<QString, QmlLiveTextPreview *> m_textPreviews; QmlJS::Snapshot m_loadedSnapshot; //the snapshot loaded by the viewer QStringList m_pendingPreviewDocumentNames; - bool m_selectionCallbackExpected; - bool m_cursorPositionChangedExternally; // toolbar bool m_toolsClientConnected; |