diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-16 10:01:29 +0100 |
---|---|---|
committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-16 10:01:29 +0100 |
commit | 440f452aa3a5609e5f6006a03ac36d41462d5908 (patch) | |
tree | 598d682291945055e4f6feb08a228212648482c1 /tools/configure/main.cpp | |
parent | cd1e62ffc121cc68c5a133a8095d431f04d966ce (diff) | |
parent | d4959fa6376255ab4adf8adaeb2ee47ae6b679d2 (diff) |
Merge master into api_changes
Conflicts:
src/corelib/kernel/qmetatype.cpp
src/gui/kernel/qplatformsurface_qpa.cpp
tests/auto/corelib/tools/qtimeline/qtimeline.pro
Change-Id: Iff3fff34eeeb06f02369767ddfce44cfde505178
Diffstat (limited to 'tools/configure/main.cpp')
-rw-r--r-- | tools/configure/main.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tools/configure/main.cpp b/tools/configure/main.cpp index 51abd7aa82..08cd691875 100644 --- a/tools/configure/main.cpp +++ b/tools/configure/main.cpp @@ -87,11 +87,17 @@ int runConfigure( int argc, char** argv ) if( !app.isDone() ) app.generateConfigfiles(); if( !app.isDone() ) - app.displayConfig(); - if( !app.isDone() ) app.generateHeaders(); if( !app.isDone() ) app.buildQmake(); + // must be done after buildQmake() + if (!app.isDone()) + app.detectArch(); + // must be done after detectArch() + if (!app.isDone()) + app.generateQConfigPri(); + if (!app.isDone()) + app.displayConfig(); #endif if( !app.isDone() ) app.generateMakefiles(); |