From 267dd9133d76d466c0f940e7286dc9ba03bac18e Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Fri, 16 Sep 2016 14:37:16 +0200
Subject: 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>
---
 qmake/qmake.pri | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'qmake/qmake.pri')

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 \
-- 
cgit v1.2.3