summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesus Fernandez <jesus.fernandez@theqtcompany.com>2016-04-15 16:13:34 +0200
committerJesus Fernandez <jesus.fernandez@theqtcompany.com>2016-04-29 08:40:06 +0000
commitf3d38d0c291b4bde1edac176d1a1fb5369e695fd (patch)
tree0cfd315b689874200a69c2b0f351a8117ec56266
parentab2f768a8f1e1e43e70de4129b2ca9422f5f2dce (diff)
Unchecked return value in QMakeProject
CID 21629: The QMakeProject::read result was ignored. MetaMakefileGenerator::createMakefileGenerator will be called if the project was read. Change-Id: I9187c82efd1abedcaa8e394f1fdb0b7f35a2b1d7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-rw-r--r--qmake/generators/metamakefile.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp
index 01e6fa4c6b..6e92893cfd 100644
--- a/qmake/generators/metamakefile.cpp
+++ b/qmake/generators/metamakefile.cpp
@@ -230,10 +230,8 @@ MakefileGenerator
build_proj->setExtraVars(basevars);
build_proj->setExtraConfigs(basecfgs);
- build_proj->read(project->projectFile());
-
- //done
- return createMakefileGenerator(build_proj);
+ if (build_proj->read(project->projectFile()))
+ return createMakefileGenerator(build_proj);
}
return 0;
}