diff options
Diffstat (limited to 'qmake')
-rw-r--r-- | qmake/generators/win32/borland_bmake.cpp | 1 | ||||
-rw-r--r-- | qmake/generators/win32/mingw_make.cpp | 1 | ||||
-rw-r--r-- | qmake/generators/win32/msvc_nmake.cpp | 1 | ||||
-rw-r--r-- | qmake/project.cpp | 6 |
4 files changed, 7 insertions, 2 deletions
diff --git a/qmake/generators/win32/borland_bmake.cpp b/qmake/generators/win32/borland_bmake.cpp index bf1041f9f5..4c4ddf642e 100644 --- a/qmake/generators/win32/borland_bmake.cpp +++ b/qmake/generators/win32/borland_bmake.cpp @@ -139,6 +139,7 @@ void BorlandMakefileGenerator::writeBuildRulesPart(QTextStream &t) { if (project->first("TEMPLATE") == "aux") { t << "first:" << endl; + t << "all:" << endl; return; } diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp index c088e8e480..e62221e636 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -433,6 +433,7 @@ void MingwMakefileGenerator::writeBuildRulesPart(QTextStream &t) { if (project->first("TEMPLATE") == "aux") { t << "first:" << endl; + t << "all:" << endl; return; } diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index b48dd4230a..db6651cb88 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -344,6 +344,7 @@ void NmakeMakefileGenerator::writeBuildRulesPart(QTextStream &t) { if (project->first("TEMPLATE") == "aux") { t << "first:" << endl; + t << "all:" << endl; return; } 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; |