diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-16 18:18:13 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-08-19 04:26:59 +0000 |
| commit | de1da50557a8a641f0620b1e4c490fc1f36b70c9 (patch) | |
| tree | 03a5774159ac151aee87eb48b4760d5affef7c28 /qtbase.pro | |
| parent | ce942a22653231bc780fa4026ea4bac3fa1fe0b9 (diff) | |
| download | qtbase-de1da50557a8a641f0620b1e4c490fc1f36b70c9.tar.gz | |
make bootstrapped build work entirely without generated headers
instead, the only relevant defines from qconfig.h (QT_VERSION*) are
passed on the command line, like we already did for qmake and
configure.exe.
this enables us to remove the early forwarding header generation from
qtbase.pro, and rely wholly on the regular mechanism from syncqt +
qt_module_headers.prf.
another advantage is that we can be sure that the bootstrapped namespace
is not polluted by the target feature configuration.
Change-Id: If29285cfc697ae56b591e2ff1a2114686d18fb30
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'qtbase.pro')
| -rw-r--r-- | qtbase.pro | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/qtbase.pro b/qtbase.pro index 93a2f6264f..481374b0da 100644 --- a/qtbase.pro +++ b/qtbase.pro @@ -148,21 +148,11 @@ FEATURES_PRI = \ "QT_DISABLED_FEATURES = \$\$unique(QT_DISABLED_FEATURES)" write_file($$OUT_PWD/mkspecs/qfeatures.pri, FEATURES_PRI)|error() -# Create forwarding headers for qconfig.h -FWD_QCONFIG_H = \ - '$${LITERAL_HASH}include "../../src/corelib/global/qconfig.h"' -write_file($$OUT_PWD/include/QtCore/qconfig.h, FWD_QCONFIG_H)|error() -FWD_QTCONFIG = \ - '$${LITERAL_HASH}include "qconfig.h"' -write_file($$OUT_PWD/include/QtCore/QtConfig, FWD_QTCONFIG)|error() - # Files created by us QMAKE_DISTCLEAN += \ src/corelib/global/qfeatures.h \ include/QtCore/qfeatures.h \ - mkspecs/qfeatures.pri \ - include/QtCore/qconfig.h \ - include/QtCore/QtConfig + mkspecs/qfeatures.pri #mkspecs mkspecs.path = $$[QT_HOST_DATA]/mkspecs |