diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-05-17 18:01:14 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-22 21:18:02 +0200 |
commit | 23ee57c5e97c2108c20929bac08c7f0bbb741a4c (patch) | |
tree | 5520aeb3769f82872a349799901d767616215139 /tools | |
parent | f18b0810be29acbebeab86e7571d1cb4062ee763 (diff) |
move detectArch() call right after autoDetection()
it belongs there (technically, it would not hurt to actually call it
from within autoDetection()).
Task-number: QTBUG-31095
Change-Id: I7eb53762513eb9cebfd22317c8f44fe123eb91dd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/configure/main.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/tools/configure/main.cpp b/tools/configure/main.cpp index 3a6390d5c2..9beee36a50 100644 --- a/tools/configure/main.cpp +++ b/tools/configure/main.cpp @@ -68,16 +68,20 @@ int runConfigure( int argc, char** argv ) if (!app.isOk()) return 3; + // Source file with path settings. Needed by qmake. app.generateQConfigCpp(); + // Bootstrapped includes. Needed by qmake. app.generateHeaders(); if (!app.isOk()) return 3; + // Bootstrap qmake. Needed by config tests. app.buildQmake(); if (!app.isOk()) return 3; + // Prepare the config test build directory. app.prepareConfigTests(); if (!app.isOk()) return 3; @@ -85,6 +89,9 @@ int runConfigure( int argc, char** argv ) // Auto-detect modules and settings. app.autoDetection(); + // ... and the CPU architectures. + app.detectArch(); + // After reading all command-line arguments, and doing all the // auto-detection, it's time to do some last minute validation. // If the validation fails, we cannot continue. @@ -97,10 +104,6 @@ int runConfigure( int argc, char** argv ) app.generateCachefile(); if( !app.isDone() ) app.generateConfigfiles(); - // must be done after buildQmake() - if (!app.isDone()) - app.detectArch(); - // must be done after detectArch() if (!app.isDone()) app.generateQConfigPri(); if (!app.isDone()) |