From 693df71e0f1faea94f2b39658cfc3fb8bb5ee2a6 Mon Sep 17 00:00:00 2001 From: Rafael Roquetto Date: Thu, 14 Jun 2012 16:17:11 +0200 Subject: Fix configure.exe to build qmake before tests qmake is needed by autoDetection()/tryCompileProject() to be able to build the tests. This patch also add a new method - generateQConfigCpp() - which generates qconfig.cpp, needed to build qmake. Change-Id: Ic304a364a13a2b3c28433f2a299df222a56fed67 Reviewed-by: Sean Harmer Reviewed-by: Oswald Buddenhagen --- tools/configure/main.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'tools/configure/main.cpp') diff --git a/tools/configure/main.cpp b/tools/configure/main.cpp index 794793b52f..e153cf1eb0 100644 --- a/tools/configure/main.cpp +++ b/tools/configure/main.cpp @@ -68,6 +68,12 @@ int runConfigure( int argc, char** argv ) if (!app.isOk()) return 3; + app.generateQConfigCpp(); + + app.buildQmake(); + if (!app.isOk()) + return 3; + // Auto-detect modules and settings. app.autoDetection(); @@ -88,8 +94,6 @@ int runConfigure( int argc, char** argv ) app.generateConfigfiles(); if( !app.isDone() ) app.generateHeaders(); - if( !app.isDone() ) - app.buildQmake(); // must be done after buildQmake() if (!app.isDone()) app.detectArch(); -- cgit v1.2.3