From 0b2d55390c20d70c4bfac1fa4ec3f580be0b907e Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Tue, 11 Sep 2012 15:08:48 +0200
Subject: 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>
---
 tools/configure/configureapp.cpp | 3 +++
 tools/configure/main.cpp         | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'tools')

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();
-- 
cgit v1.2.3