summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorSimo Fält <simo.falt@nokia.com>2012-03-29 13:35:50 +0300
committerSimo Fält <simo.falt@nokia.com>2012-03-29 13:35:50 +0300
commitca572c0b806388cbc58dcba4ab6d7cc25d89366a (patch)
treef0d6175666984d0184dfe2605e1bd9e91fb02157 /qmake
parent064dc31b190f737e2ae83d3629c31512cb69435c (diff)
parent4451010026aa559ec0f88e096f7f6afe28c34b6f (diff)
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbaseqt-v5.0.0-alpha1
Diffstat (limited to 'qmake')
-rw-r--r--qmake/project.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp
index b82b793319..8e4b1744b9 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -1721,7 +1721,8 @@ QMakeProject::doProjectExpand(QString func, QList<QStringList> args_list,
function_blocks.push(defined);
QStringList ret;
defined->exec(args_list, this, place, ret);
- Q_ASSERT(function_blocks.pop() == defined);
+ bool correct = function_blocks.pop() == defined;
+ Q_ASSERT(correct); Q_UNUSED(correct);
return ret;
}
@@ -2206,7 +2207,8 @@ QMakeProject::doProjectTest(QString func, QList<QStringList> args_list, QHash<QS
QStringList ret;
function_blocks.push(defined);
defined->exec(args_list, this, place, ret);
- Q_ASSERT(function_blocks.pop() == defined);
+ bool correct = function_blocks.pop() == defined;
+ Q_ASSERT(correct); Q_UNUSED(correct);
if(ret.isEmpty()) {
return true;