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/qmlcppengine.cpp | |
| 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/qmlcppengine.cpp')
| -rw-r--r-- | src/plugins/debugger/qml/qmlcppengine.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp index f1e789d55c..f1eb0ed519 100644 --- a/src/plugins/debugger/qml/qmlcppengine.cpp +++ b/src/plugins/debugger/qml/qmlcppengine.cpp @@ -34,6 +34,7 @@ #include "stackhandler.h" #include "qmlengine.h" #include "watchdata.h" +#include "watchhandler.h" #include <coreplugin/icore.h> #include <utils/qtcassert.h> @@ -135,6 +136,13 @@ void QmlCppEngine::updateWatchData(const WatchData &data, d->m_activeEngine->updateWatchData(data, flags); } +void QmlCppEngine::watchDataSelected(const QByteArray &iname) +{ + const WatchData *wd = watchHandler()->findData(iname); + if (wd && wd->isInspect()) + d->m_qmlEngine->watchDataSelected(iname); +} + void QmlCppEngine::watchPoint(const QPoint &point) { d->m_cppEngine->watchPoint(point); |