summaryrefslogtreecommitdiffstats
path: root/qmake/generators
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2010-05-14 12:02:51 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2010-05-14 12:38:50 (GMT)
commit61e66e8ce4a7c1412939efb47663078a2184ffb2 (patch)
tree69df41b919a175eabf835053f647ad9cc4abff39 /qmake/generators
parentcd719dee504dc70d53a6b24e746caf9e69d83ddb (diff)
downloadQt-61e66e8ce4a7c1412939efb47663078a2184ffb2.zip
Qt-61e66e8ce4a7c1412939efb47663078a2184ffb2.tar.gz
Qt-61e66e8ce4a7c1412939efb47663078a2184ffb2.tar.bz2
Fix requires keyword handling in qmake in Symbian
Now qmake doesn't generate bld.inf etc. files for projects that fail requires check. An error message is also printed. Task-number: QTBUG-10698 Reviewed-by: Iain
Diffstat (limited to 'qmake/generators')
-rw-r--r--qmake/generators/symbian/symmake.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp
index faafb20..1dee4ac 100644
--- a/qmake/generators/symbian/symmake.cpp
+++ b/qmake/generators/symbian/symmake.cpp
@@ -175,6 +175,12 @@ void SymbianMakefileGenerator::writeHeader(QTextStream &t)
bool SymbianMakefileGenerator::writeMakefile(QTextStream &t)
{
+ if(!project->values("QMAKE_FAILED_REQUIREMENTS").isEmpty()) {
+ fprintf(stderr, "Project files not generated because all requirements are not met:\n\t%s\n",
+ qPrintable(var("QMAKE_FAILED_REQUIREMENTS")));
+ return false;
+ }
+
writeHeader(t);
QString numberOfIcons;