Use the qmake based configuration system also on Windows

Adapt configure.exe to use qmake to do most of the work of configuring
Qt. This unifies a large part of our configuration system between Unix
and Windows. configure.exe is now still doing the license check,
creating qconfig.cpp, building qmake, and not much more.

On the way, re-implement the still missing Windows-specific tests with
the new system.

The opengles2 vs. opengl-desktop conditions got a bit convoluted, as
Unix prefers desktop GL, while Windows GLES2 (via ANGLE). Superficially,
there is a circular dependency, but the platform scopes are supposed to
break it.

Done-with: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Change-Id: Ia1941f2c34b7f5bd4990a7673cd737361381c2e7
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

1 files changed, 4 insertions, 21 deletions

diff --git a/tools/configure/main.cpp b/tools/configure/main.cpp
index 426cdbd294..ac521f42e4 100644
--- a/tools/configure/main.cpp
+++ b/tools/configure/main.cpp
@@ -75,29 +75,12 @@ int runConfigure( int argc, char** argv )
     if (!app.isOk())
         return 3;
 
-    // Auto-detect modules and settings.
-    app.autoDetection();
-
-    // After reading all command-line arguments, and doing all the
-    // auto-detection, it's time to do some last minute validation.
-    // If the validation fails, we cannot continue.
-    if (!app.verifyConfiguration())
+    // run qmake based configure
+    app.configure();
+    if (!app.isOk())
         return 3;
 
-    app.generateOutputVars();
-
-    if( !app.isDone() )
-        app.generateCachefile();
-    if( !app.isDone() )
-        app.generateConfigfiles();
-    if (!app.isDone())
-        app.generateQConfigPri();
-    if (!app.isDone())
-        app.displayConfig();
-    if( !app.isDone() )
-        app.generateMakefiles();
-    if( !app.isDone() )
-        app.showSummary();
+    app.generateMakefiles();
     if( !app.isOk() )
         return 2;