Do not crash qmake if MAKEFILE_GENERATOR is not defined in a loaded .pr* file

If there is a issue loading the usual .pr* files do not crash qmake.
Print out a useful warning if MAKEFILE_GENERATOR is not defined by a
loaded .pr* file.

Reviewed-by: mariusSO

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;