diff options
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(); |