summaryrefslogtreecommitdiff
path: root/src/libs/cplusplus/pp-engine.cpp
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@nokia.com>2010-02-08 15:32:37 +0100
committerErik Verbruggen <erik.verbruggen@nokia.com>2010-02-08 15:41:18 +0100
commit1af05166d956526728db448cfe34a98ee0e74e8f (patch)
tree39aabcd58c060040fe413d4b02ac1250f40a2c72 /src/libs/cplusplus/pp-engine.cpp
parentbd1b9e6ccb3fb9c1e02df6644e2e50e4e0c5e5ee (diff)
downloadqt-creator-1af05166d956526728db448cfe34a98ee0e74e8f.tar.gz
Removed Q_DECLARE_FLAGS parsing, leaving it to the CPP to expand it.
Diffstat (limited to 'src/libs/cplusplus/pp-engine.cpp')
-rw-r--r--src/libs/cplusplus/pp-engine.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp
index 7c9fe50b39..3f3c7099a1 100644
--- a/src/libs/cplusplus/pp-engine.cpp
+++ b/src/libs/cplusplus/pp-engine.cpp
@@ -766,8 +766,10 @@ void Preprocessor::preprocess(const QString &fileName, const QByteArray &source,
expandBuiltinMacro(identifierToken, spell);
else {
- if (spell != "Q_PROPERTY" && spell != "Q_INVOKABLE" && spell != "Q_ENUMS"
- && spell != "Q_FLAGS" && spell != "Q_DECLARE_FLAGS") {
+ if (spell != "Q_PROPERTY"
+ && spell != "Q_INVOKABLE"
+ && spell != "Q_ENUMS"
+ && spell != "Q_FLAGS") {
// ### FIXME: shouldn't this be T_Q_PROPERTY & friends?