diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-10 12:48:01 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-10 15:31:45 +0200 |
| commit | 143c4d3e13a430b951f4f4f8c28db14303f80605 (patch) | |
| tree | 2b89637b93fc7d81c674106008566010f986d67c /qmake/project.cpp | |
| parent | a7ed81b557d593a8ddb43b71bf4bbf3b44ead070 (diff) | |
| parent | e5337ad1b1fb02873ce7b5ca8db45f6fd8063352 (diff) | |
Merge remote-tracking branch 'origin/master' into api_changes
Conflicts:
configure
src/widgets/styles/qwindowsxpstyle.cpp
tests/auto/gui/kernel/qwindow/qwindow.pro
tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
Change-Id: I624b6d26abce9874c610c04954c1c45bc074bef3
Diffstat (limited to 'qmake/project.cpp')
| -rw-r--r-- | qmake/project.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index 1f936a04c2..c491e9b1b7 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; |