From 267dd9133d76d466c0f940e7286dc9ba03bac18e Mon Sep 17 00:00:00 2001 From: Lars Knoll 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 Reviewed-by: Lars Knoll --- src/tools/bootstrap/bootstrap.pro | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'src/tools/bootstrap') diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index 8a1e1fd6e3..0e0a617f2b 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -11,22 +11,10 @@ MODULE_DEFINES = \ QT_VERSION_MINOR=$$QT_MINOR_VERSION \ QT_VERSION_PATCH=$$QT_PATCH_VERSION \ QT_BOOTSTRAPPED \ - QT_LITE_UNICODE \ - QT_NO_CAST_TO_ASCII \ - QT_NO_CODECS \ - QT_NO_DATASTREAM \ - QT_NO_LIBRARY \ - QT_NO_QOBJECT \ - QT_NO_SYSTEMLOCALE \ - QT_NO_THREAD \ - QT_NO_UNICODETABLES \ - QT_NO_USING_NAMESPACE \ - QT_NO_DEPRECATED \ - QT_NO_TRANSLATION + QT_NO_CAST_TO_ASCII DEFINES += \ $$MODULE_DEFINES \ - QT_CRYPTOGRAPHICHASH_ONLY_SHA1 \ QT_NO_FOREACH \ QT_NO_CAST_FROM_ASCII -- cgit v1.2.3