diff options
| author | Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> | 2015-02-27 14:43:25 +0100 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> | 2015-02-27 14:19:35 +0000 |
| commit | 91c0629fe10991b0f1158ec12d9cd08e69cb5b7e (patch) | |
| tree | 1e1c1516a1d0c85054371b4886c575f9132fb384 /src/plugins/cpptools/cppmodelmanager.cpp | |
| parent | 436ed7843dd8cdc627fb7cee5ea6f3cf7349e353 (diff) | |
| download | qt-creator-91c0629fe10991b0f1158ec12d9cd08e69cb5b7e.tar.gz | |
CppTools: Handle _Pragma() and __pragma()
These operators led to parse errors, most prominently in Q_OBJECT uses
since this macro nowdays uses these operators.
Task-number: QTCREATORBUG-13905
Change-Id: I65632820d02ca5c5ef0b98f5d969cdc516d7f5b0
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanager.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppmodelmanager.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index ea7c038d7f..d52d209a1e 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -179,6 +179,8 @@ const char pp_configuration[] = "#define __builtin_va_arg(a,b) ((b)0)\n" + "#define _Pragma(x)\n" // C99 _Pragma operator + // ### add macros for win32 "#define __cdecl\n" "#define __stdcall\n" @@ -193,7 +195,8 @@ const char pp_configuration[] = "#define __except catch\n" "#define __finally\n" "#define __inline inline\n" - "#define __forceinline inline\n"; + "#define __forceinline inline\n" + "#define __pragma(x)\n"; QSet<QString> CppModelManager::timeStampModifiedFiles(const QList<Document::Ptr> &documentsToCheck) { |