diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2012-07-24 14:17:33 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2012-07-24 14:17:33 +0200 |
| commit | 42f4595e37fc859582e0bb0f332d50bd80e22973 (patch) | |
| tree | 008bf32443019517e2875ed79057be24a2f36fca /src/libs/cplusplus/cplusplus-lib.pri | |
| parent | 3f6eed50c90f28be543af439a0e2a8719d372b09 (diff) | |
| parent | cebf6b9329deeab410e09f09a17b9a611a40282d (diff) | |
| download | qt-creator-42f4595e37fc859582e0bb0f332d50bd80e22973.tar.gz | |
Merge remote-tracking branch 'origin/2.5'
Conflicts:
src/libs/cplusplus/cplusplus-lib.pri
Change-Id: I430ec8c6dda4afad3aedb1bc47d3af64537cfe66
Diffstat (limited to 'src/libs/cplusplus/cplusplus-lib.pri')
| -rw-r--r-- | src/libs/cplusplus/cplusplus-lib.pri | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libs/cplusplus/cplusplus-lib.pri b/src/libs/cplusplus/cplusplus-lib.pri index 677dff2556..2a8d5d544c 100644 --- 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 |