Regenerate tests/auto/corelib/kernel.pro

Makes the conditions nicer to look at.

Change-Id: If07b4f96892e459a7e7a6a4f541311ebda11b1a8
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot

2 files changed, 51 insertions, 11 deletions

diff --git a/tests/auto/corelib/kernel/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..5415a23a98
--- /dev/null
+++ b/tests/auto/corelib/kernel/.prev_CMakeLists.txt
@@ -0,0 +1,40 @@
+# Generated from kernel.pro.
+
+add_subdirectory(qcoreapplication)
+add_subdirectory(qdeadlinetimer)
+add_subdirectory(qelapsedtimer)
+add_subdirectory(qeventdispatcher)
+if(TARGET Qt::Network)
+    add_subdirectory(qeventloop)
+endif()
+add_subdirectory(qmath)
+add_subdirectory(qmetaobject)
+add_subdirectory(qmetaobjectbuilder)
+add_subdirectory(qmetamethod)
+add_subdirectory(qmetaproperty)
+add_subdirectory(qmetatype)
+add_subdirectory(qmetaenum)
+if(TARGET Qt::Gui)
+    add_subdirectory(qmimedata)
+endif()
+if(TARGET Qt::Network AND NOT ANDROID AND NOT APPLE_UIKIT)
+    add_subdirectory(qobject)
+endif()
+add_subdirectory(qpointer)
+if(QT_FEATURE_private_tests AND NOT ANDROID AND NOT APPLE_UIKIT)
+    add_subdirectory(qsharedmemory)
+endif()
+add_subdirectory(qsignalblocker)
+add_subdirectory(qsignalmapper)
+if(QT_FEATURE_private_tests AND TARGET Qt::Network)
+    add_subdirectory(qsocketnotifier)
+endif()
+if(QT_FEATURE_systemsemaphore AND NOT ANDROID AND NOT APPLE_UIKIT)
+    add_subdirectory(qsystemsemaphore)
+endif()
+add_subdirectory(qtimer)
+add_subdirectory(qtranslator)
+add_subdirectory(qvariant)
+if(win32_x_ AND NOT WINRT)
+    add_subdirectory(qwineventnotifier)
+endif()
diff --git a/tests/auto/corelib/kernel/CMakeLists.txt b/tests/auto/corelib/kernel/CMakeLists.txt
index 511e4f39db..9fbe2b8b7a 100644
--- a/tests/auto/corelib/kernel/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/CMakeLists.txt
@@ -1,10 +1,10 @@
 # Generated from kernel.pro.
 
-# add_subdirectory(qcoreapplication)
+# add_subdirectory(qcoreapplication) # special case
 add_subdirectory(qdeadlinetimer)
 add_subdirectory(qelapsedtimer)
 add_subdirectory(qeventdispatcher)
-if(NOT ((NOT TARGET Qt::Network)))
+if(TARGET Qt::Network)
     add_subdirectory(qeventloop)
 endif()
 add_subdirectory(qmath)
@@ -12,29 +12,29 @@ add_subdirectory(qmetaobject)
 add_subdirectory(qmetaobjectbuilder)
 add_subdirectory(qmetamethod)
 add_subdirectory(qmetaproperty)
-# add_subdirectory(qmetatype)
+# add_subdirectory(qmetatype) # special case
 add_subdirectory(qmetaenum)
-if(NOT ((NOT TARGET Qt::Gui)))
+if(TARGET Qt::Gui)
     add_subdirectory(qmimedata)
 endif()
-if(NOT ((ANDROID OR APPLE_UIKIT) OR (NOT TARGET Qt::Network)))
-    # add_subdirectory(qobject)
+if(TARGET Qt::Network AND NOT ANDROID AND NOT APPLE_UIKIT)
+    # add_subdirectory(qobject) # special case
 endif()
 add_subdirectory(qpointer)
-if(NOT ((ANDROID OR APPLE_UIKIT) OR (NOT QT_FEATURE_private_tests)))
+if(QT_FEATURE_private_tests AND NOT ANDROID AND NOT APPLE_UIKIT)
     add_subdirectory(qsharedmemory)
 endif()
 add_subdirectory(qsignalblocker)
 add_subdirectory(qsignalmapper)
-if(NOT ((NOT QT_FEATURE_private_tests) OR (NOT TARGET Qt::Network)))
+if(QT_FEATURE_private_tests AND TARGET Qt::Network)
     add_subdirectory(qsocketnotifier)
 endif()
-if(NOT ((ANDROID OR APPLE_UIKIT) OR (NOT QT_FEATURE_systemsemaphore)))
+if(QT_FEATURE_systemsemaphore AND NOT ANDROID AND NOT APPLE_UIKIT)
     add_subdirectory(qsystemsemaphore)
 endif()
-# add_subdirectory(qtimer)
+# add_subdirectory(qtimer) # special case
 add_subdirectory(qtranslator)
 add_subdirectory(qvariant)
-if(NOT ((NOT win32_x_ OR WINRT)))
+if(win32_x_ AND NOT WINRT)
     add_subdirectory(qwineventnotifier)
 endif()