move generation of qconfig.cpp (and qt.conf) to qmake-based configure

this moves us another step towards the "outer" configure doing just
minimal bootstrapping of qmake.

a challenge here was that so far, qmake itself needed qconfig.cpp. this
was replaced by usage of a qt.conf file instead of compiled-in values.
however, to make the executable still self-contained, that qt.conf is
embedded into it (by simple appending of a fixed signature and the text
file).

the qmake with the embedded qt.conf is not used for the qt build itself,
which instead relies on the qt.conf in bin/ as before. however, due to
the missing built-in values, this file now needs to contain more
information than before. but except for a minimal version that is needed
to start up qmake/configure at all, that file is now also generated with
qmake. as some of the newly set up properties are subsequently used by
configure itself, qmake gains a (deliberately undocumented) function to
reload the qt.conf after it's fully populated.

unlike the old implementations, this one doesn't emit redundant qt.conf
entries which match the hard-coded fallbacks. omitting them leads to
leaner files which are more comprehensible.

Started-by: Paolo Angelelli <paolo.angelelli@qt.io>
Change-Id: I4526ef64b3c89d9851e10f83965fe479ed7f39f6
Reviewed-by: Jake Petroules <jake.petroules@qt.io>

1 files changed, 0 insertions, 8 deletions

diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h
index 755a2e2696..32ba7d3444 100644
--- a/tools/configure/configureapp.h
+++ b/tools/configure/configureapp.h
@@ -44,7 +44,6 @@ public:
 
     void parseCmdLine();
 
-    void generateQConfigCpp();
     void buildQmake();
 
     void prepareConfigureInput();
@@ -56,8 +55,6 @@ public:
     bool isDone();
     bool isOk();
 
-    int platform() const;
-
 private:
     int verbose;
 
@@ -72,11 +69,6 @@ private:
     QString sourcePathMangled, buildPathMangled;
     QDir sourceDir, buildDir;
 
-    QString confStrOffsets[2];
-    QString confStrings[2];
-    int confStringOff;
-
-    void addConfStr(int group, const QString &val);
     QString formatPath(const QString &path);
 
     bool reloadCmdLine(int idx);