diff options
author | Lars Knoll <lars.knoll@qt.io> | 2016-09-16 14:37:16 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2016-10-11 06:04:54 +0000 |
commit | 267dd9133d76d466c0f940e7286dc9ba03bac18e (patch) | |
tree | 58a6ae2c915db69d99064901a8c54d341c9659a6 /qmake/qmake.pri | |
parent | 91cde062968f97041bca8d2a30d13aa03b606c3d (diff) |
Clean up building of bootstrap lib and tools
Add a qconfig-bootstrap.h, which contains all the defines required
to build the bootstrapped tools. This will be required anyway when
moving more code over to use QT_CONFIG(foo) instead of QT_NO_FOO.
Change-Id: I783d0aa0100b9190fe2d422bee4a95b05720aebe
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'qmake/qmake.pri')
-rw-r--r-- | qmake/qmake.pri | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/qmake/qmake.pri b/qmake/qmake.pri index 7f49bb9adb..288d99d8a2 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -151,11 +151,7 @@ bootstrap { #Qt code LFLAGS += -lcpp } - DEFINES += \ - QT_BOOTSTRAPPED \ - QT_NO_TEXTCODEC QT_NO_UNICODETABLES QT_NO_COMPONENT QT_NO_COMPRESS \ - QT_NO_THREAD QT_NO_QOBJECT QT_NO_GEOM_VARIANT QT_NO_DATASTREAM \ - QT_CRYPTOGRAPHICHASH_ONLY_SHA1 QT_JSON_READONLY QT_NO_STANDARDPATHS + DEFINES += QT_BOOTSTRAPPED INCLUDEPATH += \ $$QT.core.includes $$QT.core_private.includes \ |