Merge remote-tracking branch 'origin/2.5'

Conflicts: src/libs/cplusplus/cplusplus-lib.pri Change-Id: I430ec8c6dda4afad3aedb1bc47d3af64537cfe66
2012-07-24 14:17:33 +02:00
parent 3f6eed50c9 cebf6b9329
commit 42f4595e37
10 changed files with 1597 additions and 887 deletions
--- a/src/libs/cplusplus/cplusplus-lib.pri
+++ b/src/libs/cplusplus/cplusplus-lib.pri
@@ -53,7 +53,8 @@ HEADERS += \
    $$PWD/pp-engine.h \
    $$PWD/pp-scanner.h \
    $$PWD/findcdbbreakpoint.h \
-    $$PWD/PPToken.h
+    $$PWD/PPToken.h \
+    $$PWD/Dumpers.h

 SOURCES += \
    $$PWD/SimpleLexer.cpp \
@@ -80,6 +81,7 @@ SOURCES += \
    $$PWD/pp-engine.cpp \
    $$PWD/pp-scanner.cpp \
    $$PWD/findcdbbreakpoint.cpp \
-    $$PWD/PPToken.cpp
+    $$PWD/PPToken.cpp \
+    $$PWD/Dumpers.cpp

 RESOURCES += $$PWD/cplusplus.qrc