From f3d38d0c291b4bde1edac176d1a1fb5369e695fd Mon Sep 17 00:00:00 2001
From: Jesus Fernandez <jesus.fernandez@theqtcompany.com>
Date: Fri, 15 Apr 2016 16:13:34 +0200
Subject: [PATCH] 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>
---
qmake/generators/metamakefile.cpp | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp
index 01e6fa4c6b1..6e92893cfd7 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;
}
--
GitLab