From e3b2ff001416f2f924143c6b79b7f67f9f7e2305 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Fri, 29 Mar 2019 12:09:45 +0100
Subject: [PATCH] CMake: Re-generate testlib

Change-Id: Id3e6a3ff325ed55ac20a93683260ef3366c0ddab
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 src/testlib/CMakeLists.txt | 71 +++++++++++++++++++++++++-------------
 1 file changed, 47 insertions(+), 24 deletions(-)

diff --git a/src/testlib/CMakeLists.txt b/src/testlib/CMakeLists.txt
index ed8d2c8df7..509748e51e 100644
--- a/src/testlib/CMakeLists.txt
+++ b/src/testlib/CMakeLists.txt
@@ -1,11 +1,11 @@
+# Generated from testlib.pro.
+
 #####################################################################
 ## Test Module:
 #####################################################################
 
 add_qt_module(Test
-    # Typically the Qt module name results in qt${module}-config.h, but
-    # testlib is an exception where QtTest uses qttestlib-config.h.
-    CONFIG_MODULE_NAME "testlib"
+    CONFIG_MODULE_NAME testlib # special case
     SOURCES
         qabstracttestlogger.cpp
         qasciikey.cpp
@@ -48,42 +48,65 @@ add_qt_module(Test
         qttestglobal.h
         qxmltestlogger.cpp
         qxunittestlogger.cpp
-    LIBRARIES
-        Qt::CorePrivate
-    PUBLIC_LIBRARIES
-        Qt::Core
     DEFINES
+        QT_NO_CAST_TO_ASCII
         QT_NO_CAST_FROM_ASCII
         QT_NO_FOREACH
         QT_NO_DATASTREAM
+        QT_BUILD_TESTLIB_LIB # special case
+    LIBRARIES
+        Qt::CorePrivate
+    PUBLIC_LIBRARIES # special case
+        Qt::Core
 )
 
-# Typically the module name is also the define symbol, but testlib works
-# differently and uses QT_BUILD_TESTLIB_LIB, derived from the name testlib.pro.
-set_target_properties(Test PROPERTIES DEFINE_SYMBOL QT_BUILD_TESTLIB_LIB)
+#### Keys ignored in scope 1:.:testlib.pro:<NONE>:
+# CONFIG = "exceptions"
+# MODULE_CONFIG = "console" "testlib_defines"
+# _LOADED = "qt_module"
 
-### Platform support:
+## Scopes:
 #####################################################################
-extend_target(Test CONDITION APPLE
-    SOURCES
-        qappletestlogger.cpp qappletestlogger_p.h
-    LIBRARIES ${FWSecurity}
 
-    # FIXME: Skip XCTEST support, disabled in qmake build system
+#### Keys ignored in scope 2:.:testlib.pro:UNIX AND NOT embedded:
+# QMAKE_PKGCONFIG_DESCRIPTION = "Qt" "Unit" "Testing" "Library"
+
+extend_target(Test CONDITION QT_FEATURE_itemmodeltester
+    SOURCES
+        qabstractitemmodeltester.cpp qabstractitemmodeltester.h
+)
+
+extend_target(Test CONDITION embedded
+    COMPILE_OPTIONS
+        "-fno-rtti"
 )
 
 extend_target(Test CONDITION APPLE_OSX
-    SOURCES qtestutil_macos.mm qtestutil_macos_p.h
-    LIBRARIES ${FWFoundation} ${FWApplicationServices} ${FWIOKit}
+    SOURCES
+        qappletestlogger.cpp qappletestlogger_p.h
+        qtestutil_macos.mm qtestutil_macos_p.h
+    LIBRARIES
+        ${FWApplicationServices}
+        ${FWFoundation}
+        ${FWIOKit}
+        ${FWSecurity}
 )
 
+# special case: Do not bother with disabld stuff:
+# extend_target(Test CONDITION (APPLE_OSX) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0")) ...
+# extend_target(Test CONDITION ((APPLE_OSX) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0"))) AND (NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY) ...
 
-### Feature support:
-#####################################################################
+#### Keys ignored in scope 8:.:testlib.pro:NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY:
+# MODULE_CONFIG = "xctest"
+# platform_dev_frameworks_path = "$${QMAKE_MAC_SDK_PLATFORM_PATH}/Developer/Library/Frameworks"
 
-## itemmodeltester:
-extend_target(Test CONDITION QT_FEATURE_itemmodeltester
-    SOURCES qabstractitemmodeltester.cpp qabstractitemmodeltester.h
-)
+#### Keys ignored in scope 9:.:testlib.pro:NOT TARGET Qt::Gui:
+# HEADERSCLEAN_EXCLUDE = "qtest_gui.h" "qtestaccessible.h" "qtestkeyboard.h" "qtestmouse.h" "qtesttouch.h"
+
+#### Keys ignored in scope 10:.:testlib.pro:NOT TARGET Qt::Widgets:
+# HEADERSCLEAN_EXCLUDE = "qtest_widgets.h"
+
+#### Keys ignored in scope 11:.:testlib.pro:NOT TARGET Qt::Network:
+# HEADERSCLEAN_EXCLUDE = "qtest_network.h"
 
 add_qt_docs(./doc/qttestlib.qdocconf)