diff options
| -rw-r--r-- | mkspecs/features/qt_module_config.prf | 2 | ||||
| -rw-r--r-- | src/platformsupport/platformsupport.pro | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/mkspecs/features/qt_module_config.prf b/mkspecs/features/qt_module_config.prf index a05da5f49e..8786f77c4c 100644 --- a/mkspecs/features/qt_module_config.prf +++ b/mkspecs/features/qt_module_config.prf @@ -129,7 +129,7 @@ linux*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF QT += $$QT_PRIVATE unset(QT_PRIVATE) -!build_pass:!isEmpty(DESTDIR):CONFIG += create_cmake +!build_pass:!internal_module:!isEmpty(DESTDIR):CONFIG += create_cmake contains(TARGET, QtAddOn.*): \ DEFINES += QT_BUILD_ADDON_$${ucmodule}_LIB diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index 6becab9869..251013fad4 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -2,17 +2,11 @@ load(qt_build_config) TARGET = QtPlatformSupport QT = core-private gui-private -CONFIG += static +CONFIG += static internal_module mac:LIBS += -lz -framework CoreFoundation -framework Carbon load(qt_module_config) -# The platformsupport module is internal, so there is no -# need to create a cmake file for it. This needs to appear -# after load(qt_module_config) so that it overrides the -# setting to create cmake files which exists there. -CONFIG -= create_cmake - DEFINES += QT_NO_CAST_FROM_ASCII PRECOMPILED_HEADER = ../corelib/global/qt_pch.h |