summaryrefslogtreecommitdiffstats
path: root/qtbase.pro
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@theqtcompany.com>2016-04-15 08:21:26 +0200
committerLars Knoll <lars.knoll@theqtcompany.com>2016-04-19 14:01:40 +0000
commit710ec5caeda49ea1c3177880f70c0a853bdcff40 (patch)
tree483a85f58efd08b6e4a3dace50b5a3db4e87dfbd /qtbase.pro
parentd4f15a5be4004a93d38597cd89d798144dc10dca (diff)
Remove the -qconfig command line argument
This functionality will get replaced by a new and more flexible system to configure Qt. Change-Id: I04cf694ab1671eeed39b79a660566595a22f54a7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'qtbase.pro')
-rw-r--r--qtbase.pro4
1 files changed, 2 insertions, 2 deletions
diff --git a/qtbase.pro b/qtbase.pro
index 11cff9e8bf..34f6704752 100644
--- a/qtbase.pro
+++ b/qtbase.pro
@@ -121,14 +121,14 @@ FWD_FEATURES_H = \
write_file($$OUT_PWD/include/QtCore/qfeatures.h, FWD_FEATURES_H)|error("Aborting.")
no_features =
-lines = $$cat($$absolute_path($$QT_QCONFIG_PATH, $$PWD/src/corelib/global), lines)
+lines = $$cat($$OUT_PWD/src/corelib/global/qconfig.h, lines)
for (line, lines) {
# We ignore all defines that don't follow the #ifndef + indent pattern.
# This makes it possible to have unchecked defines which are no features.
t = $$replace(line, "^$${LITERAL_HASH} define QT_NO_(\\S+)\\s*$", "\\1")
!isEqual(t, $$line) {
isEmpty(features.$${t}.name): \
- error("$$QT_QCONFIG_PATH disables unknown feature $$t")
+ error("qconfig.h disables unknown feature $$t")
no_features += $$t
}
}