whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix auto detection in configure.exe 

All auto detection tests were failing
because the default mkspec was not yet
installed during the time they were run.

Change-Id: Iad14580f38d1539d9831917e5c9c707eae4c0c90
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
bb10
Rafael Roquetto 2012-07-18 14:01:08 +02:00 committed by Qt by Nokia
parent fc3207dfe1
commit 96bf9b181c
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/configure/configureapp.cpp
View File

@ -3211,11 +3211,6 @@ void Configure::generateConfigfiles()
tmpFile.close();
}
QString spec = dictionary.contains("XQMAKESPEC") ? dictionary["XQMAKESPEC"] : dictionary["QMAKESPEC"];
if (!copySpec("default", "", spec)
|| !copySpec("default-host", "host ", dictionary["QMAKESPEC"]))
return;
QTemporaryFile tmpFile3;
if (tmpFile3.open()) {
tmpStream.setDevice(&tmpFile3);
@ -3635,6 +3630,15 @@ void Configure::buildQmake()
confStream.flush();
confFile.close();
}
//create default mkspecs
QString spec = dictionary.contains("XQMAKESPEC") ? dictionary["XQMAKESPEC"] : dictionary["QMAKESPEC"];
if (!copySpec("default", "", spec)
|| !copySpec("default-host", "host ", dictionary["QMAKESPEC"])) {
cout << "Error installing default mkspecs" << endl << endl;
exit(EXIT_FAILURE);
}
}
#endif