AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Create CMake files conditionally on the internal_module CONFIG option.

Browse Source 
This includes a revert of 195df6e8e0
so that the solution scales better to other Qt modules, and other
logic related to 'internal' modules.

Change-Id: Ie4c1f10d20953aeb15438273081a810ab8bc9ec9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Stephen Kelly 2012-07-23 16:35:58 +02:00 committed by Qt by Nokia
parent 78d8c201f1
commit 58b3dd71d8
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkspecs/features/qt_module_config.prf
View File

@ -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

8
src/platformsupport/platformsupport.pro
View File

@ -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