summaryrefslogtreecommitdiff
path: root/src/plugins/debugger/qml/qmlengine.h
diff options
context:
space:
mode:
authorhjk <hjk@theqtcompany.com>2015-06-08 18:07:11 +0200
committerhjk <hjk@theqtcompany.com>2015-06-10 07:40:27 +0000
commit5309e217e460d4f20ab932334b9e808216f9b2a7 (patch)
tree26b5f6010ea7efb2bb0acf1c2a2f407790d36bb3 /src/plugins/debugger/qml/qmlengine.h
parent7d257acb4b82b644c3c0d91ff38d6661d38896e1 (diff)
downloadqt-creator-5309e217e460d4f20ab932334b9e808216f9b2a7.tar.gz
Debugger: Consolidate GDB and LLDB "updateLocals" code paths
This splits the bool setToolTipExpression() operation into a bool canHandleToolTip(), and the actual processing of the request, which is mostly identical to the handling of a watcher. Handling a watcher is now mostly the same as a full Locals update, except for the 'partial' flag. Pushing the handling of that down to the bridges gives identical code paths in the gdb and lldbengine. Move that to the DebuggerEngine base class. Change-Id: I3861b43e8630c7e7bd57fcd549b2a2387e3d4869 Reviewed-by: hjk <hjk@theqtcompany.com> Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Diffstat (limited to 'src/plugins/debugger/qml/qmlengine.h')
-rw-r--r--src/plugins/debugger/qml/qmlengine.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/plugins/debugger/qml/qmlengine.h b/src/plugins/debugger/qml/qmlengine.h
index 8fd88c1dcf..35517e9c4b 100644
--- a/src/plugins/debugger/qml/qmlengine.h
+++ b/src/plugins/debugger/qml/qmlengine.h
@@ -89,9 +89,6 @@ public:
void insertBreakpoint(Breakpoint bp);
-signals:
- void tooltipRequested(const DebuggerToolTipContext &context);
-
private slots:
void disconnected();
void documentUpdated(QmlJS::Document::Ptr doc);
@@ -128,7 +125,7 @@ private:
void shutdownInferior();
void shutdownEngine();
- bool setToolTipExpression(const DebuggerToolTipContext &);
+ bool canHandleToolTip(const DebuggerToolTipContext &) const;
void continueInferior();
void interruptInferior();
@@ -157,8 +154,8 @@ private:
void reloadFullStack() {}
bool supportsThreads() const { return false; }
- void updateWatchItem(WatchItem *item);
- void watchDataSelected(const QByteArray &iname);
+ void updateWatchData(const QByteArray &iname);
+ void selectWatchData(const QByteArray &iname);
void executeDebuggerCommand(const QString &command, DebuggerLanguages languages);
bool evaluateScript(const QString &expression);