diff options
| author | Rafael Roquetto <rafael.roquetto.qnx@kdab.com> | 2012-07-18 14:01:08 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-18 14:36:12 +0200 |
| commit | 96bf9b181cf06695dc439674be79a126997cb9eb (patch) | |
| tree | fe11d753cf6ad66d8393eb115e0007765fdb7a3d /tools | |
| parent | fc3207dfe1b615a856b6ad8eef22a8774e4a17f4 (diff) | |
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>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 153be04ee6..fc33922f5b 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -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 |