Create CMake files conditionally on the internal_module CONFIG option.

This includes a revert of 195df6e8e0ffb2636cfe395f560eb73c05a54b61
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>

diff --git a/mkspecs/features/qt_module_config.prf b/mkspecs/features/qt_module_config.prf
index a05da5f..8786f77 100644 (file)
--- 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 6becab9..251013f 100644 (file)
--- 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