diff options
| author | Eike Ziller <[email protected]> | 2013-04-30 11:43:33 +0200 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2013-04-30 11:43:33 +0200 |
| commit | bedc477943ba94c38db133b8cf6d20132d56a315 (patch) | |
| tree | ae64d44a5d12f66e07a0c2d963d885bcf0ceb5db /src/libs/cplusplus/pp-engine.cpp | |
| parent | 3aa0e500392192dc6306a29d4a60b4d362a29811 (diff) | |
| parent | 71f1919de9a1ce0abc370fb2a1044ad6e85438cf (diff) | |
Merge remote-tracking branch 'origin/2.7'
Conflicts:
src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp
Change-Id: I4e0a85795e7f4bfcdc21d106517517b527f85104
Diffstat (limited to 'src/libs/cplusplus/pp-engine.cpp')
| -rw-r--r-- | src/libs/cplusplus/pp-engine.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp index 83040283d83..91aa73efb9b 100644 --- a/src/libs/cplusplus/pp-engine.cpp +++ b/src/libs/cplusplus/pp-engine.cpp @@ -1001,6 +1001,8 @@ bool Preprocessor::handleIdentifier(PPToken *tk) bool hasMatchingArgs = false; if (hasArgs) { const int expectedArgCount = macro->formals().size(); + if (macro->isVariadic() && allArgTks.size() == expectedArgCount - 1) + allArgTks.push_back(QVector<PPToken>()); const int actualArgCount = allArgTks.size(); if (expectedArgCount == actualArgCount || (macro->isVariadic() && actualArgCount > expectedArgCount - 1) |