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, 3 insertions, 56 deletions

diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h
index 9d3f7e39a8..6af83d44cd 100644
--- a/tools/configure/configureapp.h
+++ b/tools/configure/configureapp.h
@@ -44,76 +44,32 @@ public:
 
     void parseCmdLine();
 
-    QString defaultTo(const QString &option);
-    bool checkAvailability(const QString &part);
     void generateQConfigCpp();
     void buildQmake();
-    void autoDetection();
-    bool verifyConfiguration();
 
-    void generateOutputVars();
+    void prepareConfigureInput();
+    void configure();
+
     void generateHeaders();
-    void generateCachefile();
-    void displayConfig();
     void generateMakefiles();
-    void generateConfigfiles();
-    void detectArch();
-    void generateQConfigPri();
     void generateQDevicePri();
     void prepareConfigTests();
-    void showSummary();
 
     bool showLicense(QString licenseFile);
     void readLicense();
 
-    QString addDefine(QString def);
-
     bool isDone();
     bool isOk();
 
     int platform() const;
     QString platformName() const;
-    QString qpaPlatformName() const;
 
 private:
-    bool checkAngleAvailability(QString *errorMessage = 0) const;
-    QString checkAvx512Availability();
-
     int verbose;
 
     // Our variable dictionaries
     QMap<QString,QString> dictionary;
-    QStringList allBuildParts;
-    QStringList defaultBuildParts;
-    QStringList buildParts;
-    QStringList nobuildParts;
-    QStringList skipModules;
-    QStringList disabledModules;
-    QStringList enabledModules;
-    QStringList modules;
     QStringList configCmdLine;
-    QStringList qmakeConfig;
-    QStringList qtConfig;
-
-    QStringList qmakeSql;
-
-    QStringList qmakeStyles;
-
-    QStringList qmakeVars;
-    QStringList qmakeDefines;
-    QStringList qmakeIncludes;
-    QStringList qmakeLibs;
-    QString opensslLibs;
-    QString opensslLibsDebug;
-    QString opensslLibsRelease;
-    QString opensslPath;
-    QString dbusPath;
-    QString dbusHostPath;
-    QString mysqlPath;
-    QString psqlLibs;
-    QString zlibLibs;
-    QString sybase;
-    QString sybaseLibs;
 
     QString outputLine;
 
@@ -132,19 +88,10 @@ private:
 
     void addConfStr(int group, const QString &val);
     QString formatPath(const QString &path);
-    QString formatPaths(const QStringList &paths);
 
-    QString locateFile(const QString &fileName) const;
-    bool findFile(const QString &fileName) const { return !locateFile(fileName).isEmpty(); }
-    static QString findFileInPaths(const QString &fileName, const QStringList &paths);
     void reloadCmdLine(int idx);
     void saveCmdLine();
 
-    void addSysroot(QString *command);
-    bool tryCompileProject(const QString &projectPath, const QString &extraOptions = QString(),
-                           bool distClean = true);
-    bool compilerSupportsFlag(const QString &compilerAndArgs);
-
     void applySpecSpecifics();
 
     QString formatConfigPath(const char *var);