Merge remote-tracking branch 'origin/wip/cmake' into dev

 Conflicts:
	tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt

Hopefully final merge from wip/cmake, and then all cmake changes
should target dev directly.

Change-Id: I29b04c9b0284e97334877c77a32ffdf887dbf95b

14 files changed, 18 insertions, 40 deletions

diff --git a/tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt
index 7840ba51ba..755cbecd2e 100644
--- a/tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt
@@ -7,9 +7,8 @@
 add_qt_executable(badxml
     SOURCES
         tst_badxml.cpp
-    LIBRARIES
-        Qt::CorePrivate
     PUBLIC_LIBRARIES
+        Qt::CorePrivate
         Qt::Test
 )
 
diff --git a/tests/auto/testlib/selftests/badxml/CMakeLists.txt b/tests/auto/testlib/selftests/badxml/CMakeLists.txt
index c26edd4d08..40870b1983 100644
--- a/tests/auto/testlib/selftests/badxml/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/badxml/CMakeLists.txt
@@ -9,9 +9,8 @@ add_qt_executable(badxml
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
         tst_badxml.cpp
-    LIBRARIES
-        Qt::CorePrivate
     PUBLIC_LIBRARIES
+        Qt::CorePrivate
         Qt::Test
 )
 
diff --git a/tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt
index 285f614f4a..3789558508 100644
--- a/tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt
@@ -8,10 +8,8 @@ add_qt_executable(benchlibtickcounter
     GUI
     SOURCES
         tst_benchlibtickcounter.cpp
-    LIBRARIES
-        Qt::TestPrivate
     PUBLIC_LIBRARIES
-        Qt::Test
+        Qt::TestPrivate
 )
 
 ## Scopes:
diff --git a/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt b/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt
index 9aba4104ac..1edf2826ad 100644
--- a/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt
@@ -10,10 +10,8 @@ add_qt_executable(benchlibtickcounter
     GUI
     SOURCES
         tst_benchlibtickcounter.cpp
-    LIBRARIES
-        Qt::TestPrivate
     PUBLIC_LIBRARIES
-        Qt::Test
+        Qt::TestPrivate
 )
 
 ## Scopes:
diff --git a/tests/auto/testlib/selftests/blacklisted/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/blacklisted/.prev_CMakeLists.txt
index 322b85fd08..d1eae1a783 100644
--- a/tests/auto/testlib/selftests/blacklisted/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/blacklisted/.prev_CMakeLists.txt
@@ -8,10 +8,8 @@ add_qt_executable(blacklisted
     GUI
     SOURCES
         tst_blacklisted.cpp
-    LIBRARIES
-        Qt::TestPrivate
     PUBLIC_LIBRARIES
-        Qt::Test
+        Qt::TestPrivate
 )
 
 ## Scopes:
diff --git a/tests/auto/testlib/selftests/blacklisted/CMakeLists.txt b/tests/auto/testlib/selftests/blacklisted/CMakeLists.txt
index a828d628ba..8136abe3ab 100644
--- a/tests/auto/testlib/selftests/blacklisted/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/blacklisted/CMakeLists.txt
@@ -10,10 +10,8 @@ add_qt_executable(blacklisted
     GUI
     SOURCES
         tst_blacklisted.cpp
-    LIBRARIES
-        Qt::TestPrivate
     PUBLIC_LIBRARIES
-        Qt::Test
+        Qt::TestPrivate
 )
 
 ## Scopes:
diff --git a/tests/auto/testlib/selftests/keyboard/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/keyboard/.prev_CMakeLists.txt
index e45839faee..86c58467bf 100644
--- a/tests/auto/testlib/selftests/keyboard/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/keyboard/.prev_CMakeLists.txt
@@ -7,12 +7,11 @@
 add_qt_executable(keyboard
     SOURCES
         tst_keyboard.cpp
-    LIBRARIES
-        Qt::GuiPrivate
-        Qt::TestPrivate
     PUBLIC_LIBRARIES
         Qt::Gui
+        Qt::GuiPrivate
         Qt::Test
+        Qt::TestPrivate
 )
 
 ## Scopes:
diff --git a/tests/auto/testlib/selftests/keyboard/CMakeLists.txt b/tests/auto/testlib/selftests/keyboard/CMakeLists.txt
index 4b98a88253..2766c1a36c 100644
--- a/tests/auto/testlib/selftests/keyboard/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/keyboard/CMakeLists.txt
@@ -9,12 +9,11 @@ add_qt_executable(keyboard
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
         tst_keyboard.cpp
-    LIBRARIES
-        Qt::GuiPrivate
-        Qt::TestPrivate
     PUBLIC_LIBRARIES
         Qt::Gui
+        Qt::GuiPrivate
         Qt::Test
+        Qt::TestPrivate
 )
 
 ## Scopes:
diff --git a/tests/auto/testlib/selftests/mouse/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/mouse/.prev_CMakeLists.txt
index 0ba47c3b97..4308195d73 100644
--- a/tests/auto/testlib/selftests/mouse/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/mouse/.prev_CMakeLists.txt
@@ -7,12 +7,11 @@
 add_qt_executable(mouse
     SOURCES
         tst_mouse.cpp
-    LIBRARIES
-        Qt::GuiPrivate
-        Qt::TestPrivate
     PUBLIC_LIBRARIES
         Qt::Gui
+        Qt::GuiPrivate
         Qt::Test
+        Qt::TestPrivate
 )
 
 ## Scopes:
diff --git a/tests/auto/testlib/selftests/mouse/CMakeLists.txt b/tests/auto/testlib/selftests/mouse/CMakeLists.txt
index 441569bd91..9f6b364cec 100644
--- a/tests/auto/testlib/selftests/mouse/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/mouse/CMakeLists.txt
@@ -9,12 +9,11 @@ add_qt_executable(mouse
     OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case
     SOURCES
         tst_mouse.cpp
-    LIBRARIES
-        Qt::GuiPrivate
-        Qt::TestPrivate
     PUBLIC_LIBRARIES
         Qt::Gui
+        Qt::GuiPrivate
         Qt::Test
+        Qt::TestPrivate
 )
 
 ## Scopes:
diff --git a/tests/auto/testlib/selftests/signaldumper/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/signaldumper/.prev_CMakeLists.txt
index d7c26b804d..e5989ba69e 100644
--- a/tests/auto/testlib/selftests/signaldumper/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/signaldumper/.prev_CMakeLists.txt
@@ -8,10 +8,8 @@ add_qt_executable(signaldumper
     GUI
     SOURCES
         tst_signaldumper.cpp
-    LIBRARIES
-        Qt::TestPrivate
     PUBLIC_LIBRARIES
-        Qt::Test
+        Qt::TestPrivate
 )
 
 ## Scopes:
diff --git a/tests/auto/testlib/selftests/signaldumper/CMakeLists.txt b/tests/auto/testlib/selftests/signaldumper/CMakeLists.txt
index b431875722..0376ffacd1 100644
--- a/tests/auto/testlib/selftests/signaldumper/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/signaldumper/CMakeLists.txt
@@ -10,10 +10,8 @@ add_qt_executable(signaldumper
     GUI
     SOURCES
         tst_signaldumper.cpp
-    LIBRARIES
-        Qt::TestPrivate
     PUBLIC_LIBRARIES
-        Qt::Test
+        Qt::TestPrivate
 )
 
 ## Scopes:
diff --git a/tests/auto/testlib/selftests/silent/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/silent/.prev_CMakeLists.txt
index ec645eee97..ebe7d6e299 100644
--- a/tests/auto/testlib/selftests/silent/.prev_CMakeLists.txt
+++ b/tests/auto/testlib/selftests/silent/.prev_CMakeLists.txt
@@ -8,10 +8,8 @@ add_qt_executable(silent
     GUI
     SOURCES
         tst_silent.cpp
-    LIBRARIES
-        Qt::TestPrivate
     PUBLIC_LIBRARIES
-        Qt::Test
+        Qt::TestPrivate
 )
 
 ## Scopes:
diff --git a/tests/auto/testlib/selftests/silent/CMakeLists.txt b/tests/auto/testlib/selftests/silent/CMakeLists.txt
index f02e38b75d..23916b81e0 100644
--- a/tests/auto/testlib/selftests/silent/CMakeLists.txt
+++ b/tests/auto/testlib/selftests/silent/CMakeLists.txt
@@ -10,10 +10,8 @@ add_qt_executable(silent
     GUI
     SOURCES
         tst_silent.cpp
-    LIBRARIES
-        Qt::TestPrivate
     PUBLIC_LIBRARIES
-        Qt::Test
+        Qt::TestPrivate
 )
 
 ## Scopes: