summaryrefslogtreecommitdiffstats
path: root/qmake/generators
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-06-24 21:16:41 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-06-24 21:16:41 (GMT)
commitfd5c6436d4be5ce6db57a8a34951c8ab4dac9000 (patch)
tree2b2ce0df9cd0bfcc1c8a0566668c92df8be94206 /qmake/generators
parent117b9bb3d576d9974b3d05174d1fccf98e47cb22 (diff)
parent5f5cf5b798cc7e65e47987b654beaf9d762406eb (diff)
downloadQt-fd5c6436d4be5ce6db57a8a34951c8ab4dac9000.zip
Qt-fd5c6436d4be5ce6db57a8a34951c8ab4dac9000.tar.gz
Qt-fd5c6436d4be5ce6db57a8a34951c8ab4dac9000.tar.bz2
Merge branch '4.5'
Conflicts: tests/auto/qsqldatabase/tst_databases.h
Diffstat (limited to 'qmake/generators')
-rw-r--r--qmake/generators/metamakefile.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp
index 233e8e5..7f4e914 100644
--- a/qmake/generators/metamakefile.cpp
+++ b/qmake/generators/metamakefile.cpp
@@ -136,7 +136,12 @@ BuildsMetaMakefileGenerator::init()
Build *build = new Build;
build->name = name;
build->makefile = createMakefileGenerator(project, false);
- makefiles += build;
+ if (build->makefile){
+ makefiles += build;
+ }else {
+ delete build;
+ return false;
+ }
}
return true;
}
@@ -437,7 +442,7 @@ MetaMakefileGenerator::createMakefileGenerator(QMakeProject *proj, bool noIO)
QString gen = proj->first("MAKEFILE_GENERATOR");
if(gen.isEmpty()) {
- fprintf(stderr, "No generator specified in config file: %s\n",
+ fprintf(stderr, "MAKEFILE_GENERATOR variable not set as a result of parsing : %s. Possibly qmake was not able to find files included using \"include(..)\" - enable qmake debugging to investigate more.\n",
proj->projectFile().toLatin1().constData());
} else if(gen == "UNIX") {
mkfile = new UnixMakefileGenerator;