diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-21 17:57:54 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-21 17:57:54 +0100 |
| commit | 46791c08e17740418cc701b8862a980c0f711b87 (patch) | |
| tree | bedba63fc48b80c2a2df54ea91c3f35398953aac /src/tools/moc/preprocessor.h | |
| parent | b8a38a6737acd670d92197ca5b009590d9fd8a9c (diff) | |
| parent | 9033977d3971db5352a2bb51052a723a2ac57a8f (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/tools/moc/preprocessor.h')
| -rw-r--r-- | src/tools/moc/preprocessor.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/tools/moc/preprocessor.h b/src/tools/moc/preprocessor.h index dc7c98de85..6403955c1b 100644 --- a/src/tools/moc/preprocessor.h +++ b/src/tools/moc/preprocessor.h @@ -89,6 +89,8 @@ public: int evaluateCondition(); + enum TokenizeMode { TokenizeCpp, TokenizePreprocessor, PreparePreprocessorStatement, TokenizePreprocessorStatement, TokenizeInclude, PrepareDefine, TokenizeDefine }; + static Symbols tokenize(const QByteArray &input, int lineNum = 1, TokenizeMode mode = TokenizeCpp); private: void until(Token); |