AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move detectArch() call right after autoDetection()

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2013-05-17 18:01:14 +02:00 committed by The Qt Project
parent f18b0810be
commit 23ee57c5e9
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/configure/main.cpp
View File

@ -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())