1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't verify compilers twice

Browse Source 
Change-Id: Iad214f8a14c29b633752935e31125a6f4b512f4b
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen 2014-11-11 19:05:12 +01:00
parent 84c80538af
commit 9999ada1bf
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qmake/generators/makefile.cpp
View File

@ -167,7 +167,6 @@ MakefileGenerator::verifyCompilers()
void void
MakefileGenerator::initOutPaths() MakefileGenerator::initOutPaths()
{ {
verifyCompilers();
ProValueMap &v = project->variables(); ProValueMap &v = project->variables();
//for shadow builds //for shadow builds
if(!v.contains("QMAKE_ABSOLUTE_SOURCE_PATH")) { if(!v.contains("QMAKE_ABSOLUTE_SOURCE_PATH")) {
@ -409,8 +408,8 @@ MakefileGenerator::initCompiler(const MakefileGenerator::Compiler &comp)
void void
MakefileGenerator::init() MakefileGenerator::init()
{ {
initOutPaths();
verifyCompilers(); verifyCompilers();
initOutPaths();
ProValueMap &v = project->variables(); ProValueMap &v = project->variables();