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, 0 insertions, 9 deletions

diff --git a/tools/configure/environment.h b/tools/configure/environment.h
index 12646b6d88..d14961b5ac 100644
--- a/tools/configure/environment.h
+++ b/tools/configure/environment.h
@@ -50,19 +50,10 @@ class Environment
 public:
     static Compiler detectCompiler();
     static QString detectQMakeSpec();
-    static Compiler compilerFromQMakeSpec(const QString &qmakeSpec);
-    static QString gccVersion();
 
     static int execute(QStringList arguments, const QStringList &additionalEnv, const QStringList &removeEnv);
     static QString execute(const QString &command, int *returnCode = 0);
 
-    static QString findFileInPaths(const QString &fileName, const QStringList &paths);
-    static QStringList path();
-
-    static QString detectDirectXSdk();
-    static QStringList headerPaths(Compiler compiler);
-    static QStringList libraryPaths(Compiler compiler);
-
 private:
     static Compiler detectedCompiler;