summaryrefslogtreecommitdiff
path: root/tools/linguist/shared/profileevaluator.cpp
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-04-02 12:02:39 +0200
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-04-02 18:01:53 +0200
commit5fa1cba8220b5a73aa45c83a0878a6f7c3060343 (patch)
tree74b5a93ebff944dcf4a328a1d8b591ba48ec8542 /tools/linguist/shared/profileevaluator.cpp
parent4ef666941209530ef266a34c3b32dc07642eef9a (diff)
downloadqt4-tools-5fa1cba8220b5a73aa45c83a0878a6f7c3060343.tar.gz
fix evaluation of CONFIG() and contains()
cherry-picked from creator's b3ec859c80bd0656cfc48cfe6514ec4f631b8206
Diffstat (limited to 'tools/linguist/shared/profileevaluator.cpp')
-rw-r--r--tools/linguist/shared/profileevaluator.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp
index eb6e2a795a..a0771b4ca4 100644
--- a/tools/linguist/shared/profileevaluator.cpp
+++ b/tools/linguist/shared/profileevaluator.cpp
@@ -1266,10 +1266,11 @@ bool ProFileEvaluator::Private::evaluateConditionalFunction(const QString &funct
for (int mut = 0; mut < mutuals.count(); mut++) {
if (configs[i] == mutuals[mut].trimmed()) {
cond = (configs[i] == args[0]);
- break;
+ goto done_T_CONFIG;
}
}
}
+ done_T_CONFIG:
break;
}
case CF_CONTAINS: {
@@ -1296,12 +1297,12 @@ bool ProFileEvaluator::Private::evaluateConditionalFunction(const QString &funct
for (int mut = 0; mut < mutuals.count(); mut++) {
if (val == mutuals[mut].trimmed()) {
cond = (regx.exactMatch(val) || val == args[1]);
- break;
+ goto done_T_CONTAINS;
}
}
}
}
-
+ done_T_CONTAINS:
break;
}
case CF_COUNT: {