diff options
Diffstat (limited to 'src/tools/bootstrap/bootstrap.pro')
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index a43105297f..0e0a617f2b 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -6,23 +6,15 @@ CONFIG += minimal_syncqt internal_module force_bootstrap MODULE_INCNAME = QtCore QtXml MODULE_DEFINES = \ + QT_VERSION_STR=$$shell_quote(\"$$QT_VERSION\") \ + QT_VERSION_MAJOR=$$QT_MAJOR_VERSION \ + 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 @@ -115,16 +107,17 @@ mac { ../../corelib/kernel/qcoreapplication_mac.cpp \ ../../corelib/kernel/qcore_mac.cpp OBJECTIVE_SOURCES += \ - ../../corelib/kernel/qcore_mac_objc.mm + ../../corelib/kernel/qcore_mac_objc.mm \ + ../../corelib/kernel/qcore_foundation.mm LIBS += -framework Foundation osx: LIBS_PRIVATE += -framework CoreServices - ios: LIBS_PRIVATE += -framework UIKit + uikit: LIBS_PRIVATE += -framework UIKit } macx { OBJECTIVE_SOURCES += \ - ../../corelib/tools/qstring_mac.mm \ + ../../corelib/kernel/qcore_foundation.mm \ ../../corelib/io/qstandardpaths_mac.mm } else:unix { SOURCES += \ @@ -134,7 +127,7 @@ macx { ../../corelib/io/qstandardpaths_win.cpp } -contains(QT_CONFIG, zlib)|cross_compile { +!qtConfig(system-zlib)|cross_compile { include(../../3rdparty/zlib.pri) } else { CONFIG += no_core_dep |