From 96bf9b181cf06695dc439674be79a126997cb9eb Mon Sep 17 00:00:00 2001 From: Rafael Roquetto Date: Wed, 18 Jul 2012 14:01:08 +0200 Subject: 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 --- tools/configure/configureapp.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'tools') 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 -- cgit v1.2.3