diff options
Diffstat (limited to 'qtbase.pro')
| -rw-r--r-- | qtbase.pro | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/qtbase.pro b/qtbase.pro index 34f6704752..0e44395f6f 100644 --- a/qtbase.pro +++ b/qtbase.pro @@ -24,6 +24,7 @@ DISTCLEAN_DEPS += qmake-clean # config.status (and configure.cache, which is the same for Windows) # are omitted for convenience of rebuilds. QMAKE_DISTCLEAN += \ + config.cache \ config.summary \ config.tests/.qmake.cache \ mkspecs/qconfig.pri \ @@ -31,6 +32,7 @@ QMAKE_DISTCLEAN += \ mkspecs/qhost.pri \ mkspecs/qmodule.pri \ src/corelib/global/qconfig.h \ + src/corelib/global/qconfig_p.h \ src/corelib/global/qconfig.cpp \ bin/qt.conf @@ -114,11 +116,11 @@ for (ft, features) { " QT_DISABLED_FEATURES += $$lower($$replace(ft, _, -))" } } -write_file($$OUT_PWD/src/corelib/global/qfeatures.h, FEATURES_H)|error("Aborting.") +write_file($$OUT_PWD/src/corelib/global/qfeatures.h, FEATURES_H)|error() # Create forwarding header FWD_FEATURES_H = \ '$${LITERAL_HASH}include "../../src/corelib/global/qfeatures.h"' -write_file($$OUT_PWD/include/QtCore/qfeatures.h, FWD_FEATURES_H)|error("Aborting.") +write_file($$OUT_PWD/include/QtCore/qfeatures.h, FWD_FEATURES_H)|error() no_features = lines = $$cat($$OUT_PWD/src/corelib/global/qconfig.h, lines) @@ -146,23 +148,13 @@ FEATURES_PRI = \ "$$escape_expand(\\n)$${LITERAL_HASH} Dependencies derived from <qtbase>/src/corelib/global/qfeatures.txt:" \ $$FEATURES_PRI \ "QT_DISABLED_FEATURES = \$\$unique(QT_DISABLED_FEATURES)" -write_file($$OUT_PWD/mkspecs/qfeatures.pri, FEATURES_PRI)|error("Aborting.") - -# 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("Aborting.") -FWD_QTCONFIG = \ - '$${LITERAL_HASH}include "qconfig.h"' -write_file($$OUT_PWD/include/QtCore/QtConfig, FWD_QTCONFIG)|error("Aborting.") +write_file($$OUT_PWD/mkspecs/qfeatures.pri, FEATURES_PRI)|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 |