Merge remote-tracking branch 'origin/4.0'

Conflicts: src/plugins/debugger/watchdata.cpp src/plugins/debugger/watchdata.h src/shared/qbs Change-Id: I19b338b316d9c4c046074eb85b3fec79e86e6c32
2016-06-09 12:07:01 +02:00
parent ae7e03d51f cda5f70cd9
commit 1681066c37
10 changed files with 147 additions and 86 deletions
--- a/src/plugins/debugger/watchdata.h
+++ b/src/plugins/debugger/watchdata.h
@@ -52,7 +52,6 @@ public:

    QString expression() const;
    QString realName() const;
-    quint64 realAddress() const;
    QString internalName() const;
    QString toToolTip() const;