1 files changed, 41 insertions, 29 deletions

diff --git a/src/testlib/CMakeLists.txt b/src/testlib/CMakeLists.txt
index 509748e51e..92864a9e01 100644
--- a/src/testlib/CMakeLists.txt
+++ b/src/testlib/CMakeLists.txt
@@ -7,7 +7,7 @@
 add_qt_module(Test
     CONFIG_MODULE_NAME testlib # special case
     SOURCES
-        qabstracttestlogger.cpp
+        qabstracttestlogger.cpp qabstracttestlogger_p.h
         qasciikey.cpp
         qbenchmark.cpp qbenchmark.h qbenchmark_p.h
         qbenchmarkevent.cpp qbenchmarkevent_p.h
@@ -15,13 +15,12 @@ add_qt_module(Test
         qbenchmarkmetric.cpp qbenchmarkmetric.h qbenchmarkmetric_p.h
         qbenchmarkperfevents.cpp qbenchmarkperfevents_p.h
         qbenchmarktimemeasurers_p.h
-        qbenchmarkvalgrind.cpp qbenchmarkvalgrind_p.h
-        qcsvbenchmarklogger.cpp
-        qplaintestlogger.cpp
-        qsignaldumper.cpp
+        qcsvbenchmarklogger.cpp qcsvbenchmarklogger_p.h
+        qplaintestlogger.cpp qplaintestlogger_p.h
+        qsignaldumper.cpp qsignaldumper_p.h
         qsignalspy.h
         qtaptestlogger.cpp qtaptestlogger_p.h
-        qteamcitylogger.cpp
+        qteamcitylogger.cpp qteamcitylogger_p.h
         qtest.h
         qtest_gui.h
         qtest_network.h
@@ -30,37 +29,43 @@ add_qt_module(Test
         qtestassert.h
         qtestblacklist.cpp qtestblacklist_p.h
         qtestcase.cpp qtestcase.h
+        qtestcoreelement_p.h
+        qtestcorelist_p.h
         qtestdata.cpp qtestdata.h
-        qtestelement.cpp
-        qtestelementattribute.cpp
+        qtestelement.cpp qtestelement_p.h
+        qtestelementattribute.cpp qtestelementattribute_p.h
         qtestevent.h
         qtesteventloop.h
         qtesthelpers_p.h
         qtestkeyboard.h
-        qtestlog.cpp
+        qtestlog.cpp qtestlog_p.h
         qtestmouse.cpp qtestmouse.h
-        qtestresult.cpp
+        qtestresult.cpp qtestresult_p.h
         qtestspontaneevent.h
         qtestsystem.h
-        qtesttable.cpp
+        qtesttable.cpp qtesttable_p.h
         qtesttouch.h
-        qtestxunitstreamer.cpp
+        qtestxunitstreamer.cpp qtestxunitstreamer_p.h
         qttestglobal.h
-        qxmltestlogger.cpp
-        qxunittestlogger.cpp
+        qxmltestlogger.cpp qxmltestlogger_p.h
+        qxunittestlogger.cpp qxunittestlogger_p.h
     DEFINES
-        QT_NO_CAST_TO_ASCII
         QT_NO_CAST_FROM_ASCII
-        QT_NO_FOREACH
+        QT_NO_CAST_TO_ASCII
         QT_NO_DATASTREAM
+        QT_NO_FOREACH
         QT_BUILD_TESTLIB_LIB # special case
     LIBRARIES
         Qt::CorePrivate
-    PUBLIC_LIBRARIES # special case
+    PUBLIC_LIBRARIES
         Qt::Core
+    # special case begin
+    # remove COMPILE_OPTIONS, LINK_OPTIONS, COVERAGE_OPTIONS
+    # figure out how it should be handled.
+    # special case end
 )
 
-#### Keys ignored in scope 1:.:testlib.pro:<NONE>:
+#### Keys ignored in scope 1:.:.:testlib.pro:<TRUE>:
 # CONFIG = "exceptions"
 # MODULE_CONFIG = "console" "testlib_defines"
 # _LOADED = "qt_module"
@@ -68,7 +73,7 @@ add_qt_module(Test
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:testlib.pro:UNIX AND NOT embedded:
+#### 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
@@ -76,37 +81,44 @@ extend_target(Test CONDITION QT_FEATURE_itemmodeltester
         qabstractitemmodeltester.cpp qabstractitemmodeltester.h
 )
 
+extend_target(Test CONDITION QT_FEATURE_valgrind
+    SOURCES
+        qbenchmarkvalgrind.cpp qbenchmarkvalgrind_p.h
+)
+
 extend_target(Test CONDITION embedded
     COMPILE_OPTIONS
-        "-fno-rtti"
+        -fno-rtti
 )
 
 extend_target(Test CONDITION APPLE_OSX
     SOURCES
         qappletestlogger.cpp qappletestlogger_p.h
         qtestutil_macos.mm qtestutil_macos_p.h
-    LIBRARIES
+    PUBLIC_LIBRARIES
         ${FWApplicationServices}
         ${FWFoundation}
         ${FWIOKit}
         ${FWSecurity}
 )
 
-# special case: Do not bother with disabld stuff:
+# special case begin
+# Do not bother with disabled 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) ...
+# special case end
 
-#### Keys ignored in scope 8:.:testlib.pro:NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY:
+#### Keys ignored in scope 9:.:.:testlib.pro:NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY:
 # MODULE_CONFIG = "xctest"
-# platform_dev_frameworks_path = "$${QMAKE_MAC_SDK_PLATFORM_PATH}/Developer/Library/Frameworks"
 
-#### Keys ignored in scope 9:.:testlib.pro:NOT TARGET Qt::Gui:
+#### Keys ignored in scope 10:.:.: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:
+#### Keys ignored in scope 11:.:.:testlib.pro:NOT TARGET Qt::Widgets:
 # HEADERSCLEAN_EXCLUDE = "qtest_widgets.h"
 
-#### Keys ignored in scope 11:.:testlib.pro:NOT TARGET Qt::Network:
+#### Keys ignored in scope 12:.:.:testlib.pro:NOT TARGET Qt::Network:
 # HEADERSCLEAN_EXCLUDE = "qtest_network.h"
-
-add_qt_docs(./doc/qttestlib.qdocconf)
+add_qt_docs(
+    doc/qttestlib.qdocconf
+)