Commit 91c0629f authored by Nikolai Kosjar's avatar Nikolai Kosjar

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: default avatarErik Verbruggen <erik.verbruggen@theqtcompany.com>
parent 436ed784
......@@ -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)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment