diff options
| author | Eike Ziller <[email protected]> | 2012-11-27 11:50:56 +0100 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2012-11-27 11:50:56 +0100 |
| commit | ba1d5f2cdf7d31eb862f02bd42885cdba13a7f15 (patch) | |
| tree | 5c9d0551e67612724a2ca0328636b091653c1f00 /src/plugins/debugger/debuggerengine.cpp | |
| parent | c384f52b49f0eddc7a7f8e622e1485ebb1018028 (diff) | |
| parent | deeef5308f1b3d59581aa1a65e781d434719a40d (diff) | |
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/debuggerengine.cpp')
| -rw-r--r-- | src/plugins/debugger/debuggerengine.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp index 33b3c52197d..287b20c10b5 100644 --- a/src/plugins/debugger/debuggerengine.cpp +++ b/src/plugins/debugger/debuggerengine.cpp @@ -1415,6 +1415,10 @@ void DebuggerEngine::updateWatchData(const WatchData &, const WatchUpdateFlags & { } +void DebuggerEngine::watchDataSelected(const QByteArray &iname) +{ +} + void DebuggerEngine::watchPoint(const QPoint &) { } |