diff options
| author | dt <qtc-commiter@nokia.com> | 2008-12-08 12:47:15 +0100 |
|---|---|---|
| committer | dt <qtc-commiter@nokia.com> | 2008-12-08 12:47:15 +0100 |
| commit | 942363913cd907097703ecbbe4a9da98df9613d9 (patch) | |
| tree | 04f2068b7588f0d084a938ea0e04da6e18ada5c2 /src/libs/cplusplus/cplusplus.pro | |
| parent | 83d5461c7f083277ee5948b6b4bbbd93b63415dc (diff) | |
| parent | f6fbb274ae715c05fcdee61cba5395b4fd4814b9 (diff) | |
| download | qt-creator-942363913cd907097703ecbbe4a9da98df9613d9.tar.gz | |
Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta
Conflicts:
src/plugins/qt4projectmanager/qtversionmanager.cpp
Diffstat (limited to 'src/libs/cplusplus/cplusplus.pro')
| -rw-r--r-- | src/libs/cplusplus/cplusplus.pro | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/libs/cplusplus/cplusplus.pro b/src/libs/cplusplus/cplusplus.pro index 1a2b532662..49d78fda8b 100644 --- a/src/libs/cplusplus/cplusplus.pro +++ b/src/libs/cplusplus/cplusplus.pro @@ -21,7 +21,16 @@ HEADERS += \ TypeOfExpression.h \ TypePrettyPrinter.h \ ResolveExpression.h \ - LookupContext.h + LookupContext.h \ + pp-cctype.h \ + pp-engine.h \ + pp-fwd.h \ + pp-macro-expander.h \ + pp-scanner.h \ + pp-client.h \ + pp-environment.h \ + pp-internal.h \ + pp-macro.h SOURCES += \ SimpleLexer.cpp \ @@ -35,6 +44,9 @@ SOURCES += \ TypeOfExpression.cpp \ TypePrettyPrinter.cpp \ ResolveExpression.cpp \ - LookupContext.cpp + LookupContext.cpp \ + pp-engine.cpp \ + pp-environment.cpp \ + pp-macro-expander.cpp RESOURCES += cplusplus.qrc |