diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-09-11 15:08:48 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-11 17:24:25 +0200 |
| commit | 0b2d55390c20d70c4bfac1fa4ec3f580be0b907e (patch) | |
| tree | 6d4eca9fc41f826c3c839d8cb335f2d01e098c21 /tools | |
| parent | cef552a741f24b7791368b6bba94624df42ef4a4 (diff) | |
call syncqt before building qmake
otherwise non-developer builds (which don't have it run by the configure
bootstrap) don't work.
Change-Id: Ide49c0d1646b22687d16366530b246c3754926eb
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 3 | ||||
| -rw-r--r-- | tools/configure/main.cpp | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 339b2f1b56..ff04eeb742 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3383,6 +3383,9 @@ void Configure::displayConfig() #if !defined(EVAL) void Configure::generateHeaders() { + if (dictionary["SYNCQT"] == "auto") + dictionary["SYNCQT"] = defaultTo("SYNCQT"); + if (dictionary["SYNCQT"] == "yes") { if (findFile("perl.exe")) { cout << "Running syncqt..." << endl; diff --git a/tools/configure/main.cpp b/tools/configure/main.cpp index e153cf1eb0..10376ff909 100644 --- a/tools/configure/main.cpp +++ b/tools/configure/main.cpp @@ -70,6 +70,10 @@ int runConfigure( int argc, char** argv ) app.generateQConfigCpp(); + app.generateHeaders(); + if (!app.isOk()) + return 3; + app.buildQmake(); if (!app.isOk()) return 3; @@ -92,8 +96,6 @@ int runConfigure( int argc, char** argv ) app.generateBuildKey(); if( !app.isDone() ) app.generateConfigfiles(); - if( !app.isDone() ) - app.generateHeaders(); // must be done after buildQmake() if (!app.isDone()) app.detectArch(); |