From 8e1815dcb48eee882c34a87361fc2fffba3bc212 Mon Sep 17 00:00:00 2001 From: Aurindam Jana Date: Fri, 23 Nov 2012 13:39:51 +0100 Subject: Inspector: Disable object selection from Editor Clicking around QML code in the editor would update the Inspector. This is now disabled. The problem with the behaviour is that the object tree would be expanded and that may be unwelcome for some users. Also some code snippets may be shared by multiple objects, for eg. a custom QML component. In this case, the behaviour was undefined as to which object in the tree would be selected. This case of 'one-to-many' was not handled. Finally, the inspector queries for object ids lazily. Hence, sections of code may not be associated with an id resulting in unknown behaviour. Task-number: QTCREATORBUG-8246 Change-Id: I6266fd0767d0619af70387e2e867a756548120ca Reviewed-by: Kai Koehne --- src/plugins/debugger/qml/qmlinspectoradapter.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/plugins/debugger/qml/qmlinspectoradapter.h') diff --git a/src/plugins/debugger/qml/qmlinspectoradapter.h b/src/plugins/debugger/qml/qmlinspectoradapter.h index a784db1f78..885e4bbb2b 100644 --- a/src/plugins/debugger/qml/qmlinspectoradapter.h +++ b/src/plugins/debugger/qml/qmlinspectoradapter.h @@ -82,7 +82,6 @@ private slots: void toolsClientStatusChanged(QmlDebug::ClientStatus status); void engineClientStatusChanged(QmlDebug::ClientStatus status); - void selectObjectsFromEditor(const QList &debugIds); void selectObjectsFromToolsClient(const QList &debugIds); void onObjectFetched(const QmlDebug::ObjectReference &ref); @@ -130,8 +129,6 @@ private: QHash 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; -- cgit v1.2.1 From 6bbd80143b69f64036c794041275267431333efc Mon Sep 17 00:00:00 2001 From: Aurindam Jana Date: Tue, 27 Nov 2012 17:16:57 +0100 Subject: QML/JS Console: Update context Update context from QML object tree or the stack frame depending upon debugger engine state. Change-Id: I4e6affba37acc016513ad95cd278a400aaa18c49 Reviewed-by: Christiaan Janssen --- src/plugins/debugger/qml/qmlinspectoradapter.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins/debugger/qml/qmlinspectoradapter.h') diff --git a/src/plugins/debugger/qml/qmlinspectoradapter.h b/src/plugins/debugger/qml/qmlinspectoradapter.h index 885e4bbb2b..e6c5d4d195 100644 --- a/src/plugins/debugger/qml/qmlinspectoradapter.h +++ b/src/plugins/debugger/qml/qmlinspectoradapter.h @@ -96,7 +96,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); -- cgit v1.2.1