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

18 files changed, 18 insertions, 36 deletions

diff --git a/tests/manual/rhi/compressedtexture_bc1/CMakeLists.txt b/tests/manual/rhi/compressedtexture_bc1/CMakeLists.txt
index a3754c7d75..5da0ad2932 100644
--- a/tests/manual/rhi/compressedtexture_bc1/CMakeLists.txt
+++ b/tests/manual/rhi/compressedtexture_bc1/CMakeLists.txt
@@ -8,10 +8,9 @@ add_qt_manual_test(compressedtexture_bc1
     GUI
     SOURCES
         compressedtexture_bc1.cpp
-    LIBRARIES
-        Qt::GuiPrivate
     PUBLIC_LIBRARIES
         Qt::Gui
+        Qt::GuiPrivate
 )
 
 # Resources:
diff --git a/tests/manual/rhi/compressedtexture_bc1_subupload/CMakeLists.txt b/tests/manual/rhi/compressedtexture_bc1_subupload/CMakeLists.txt
index c3c2147eb8..bd82a5cb0d 100644
--- a/tests/manual/rhi/compressedtexture_bc1_subupload/CMakeLists.txt
+++ b/tests/manual/rhi/compressedtexture_bc1_subupload/CMakeLists.txt
@@ -8,10 +8,9 @@ add_qt_manual_test(compressedtexture_bc1_subupload
     GUI
     SOURCES
         compressedtexture_bc1_subupload.cpp
-    LIBRARIES
-        Qt::GuiPrivate
     PUBLIC_LIBRARIES
         Qt::Gui
+        Qt::GuiPrivate
 )
 
 # Resources:
diff --git a/tests/manual/rhi/computebuffer/CMakeLists.txt b/tests/manual/rhi/computebuffer/CMakeLists.txt
index 41d46fcc56..e2a959c1e4 100644
--- a/tests/manual/rhi/computebuffer/CMakeLists.txt
+++ b/tests/manual/rhi/computebuffer/CMakeLists.txt
@@ -8,10 +8,9 @@ add_qt_manual_test(computebuffer
     GUI
     SOURCES
         computebuffer.cpp
-    LIBRARIES
-        Qt::GuiPrivate
     PUBLIC_LIBRARIES
         Qt::Gui
+        Qt::GuiPrivate
 )
 
 # Resources:
diff --git a/tests/manual/rhi/computeimage/CMakeLists.txt b/tests/manual/rhi/computeimage/CMakeLists.txt
index ffb99b8d1c..a634f1cf98 100644
--- a/tests/manual/rhi/computeimage/CMakeLists.txt
+++ b/tests/manual/rhi/computeimage/CMakeLists.txt
@@ -8,10 +8,9 @@ add_qt_manual_test(computeimage
     GUI
     SOURCES
         computeimage.cpp
-    LIBRARIES
-        Qt::GuiPrivate
     PUBLIC_LIBRARIES
         Qt::Gui
+        Qt::GuiPrivate
 )
 
 # Resources:
diff --git a/tests/manual/rhi/cubemap/CMakeLists.txt b/tests/manual/rhi/cubemap/CMakeLists.txt
index 5886b40138..323ad78170 100644
--- a/tests/manual/rhi/cubemap/CMakeLists.txt
+++ b/tests/manual/rhi/cubemap/CMakeLists.txt
@@ -8,10 +8,9 @@ add_qt_manual_test(cubemap
     GUI
     SOURCES
         cubemap.cpp
-    LIBRARIES
-        Qt::GuiPrivate
     PUBLIC_LIBRARIES
         Qt::Gui
+        Qt::GuiPrivate
 )
 
 # Resources:
diff --git a/tests/manual/rhi/cubemap_scissor/CMakeLists.txt b/tests/manual/rhi/cubemap_scissor/CMakeLists.txt
index 038209c448..519d9dc6ec 100644
--- a/tests/manual/rhi/cubemap_scissor/CMakeLists.txt
+++ b/tests/manual/rhi/cubemap_scissor/CMakeLists.txt
@@ -8,10 +8,9 @@ add_qt_manual_test(cubemap_scissor
     GUI
     SOURCES
         cubemap_scissor.cpp
-    LIBRARIES
-        Qt::GuiPrivate
     PUBLIC_LIBRARIES
         Qt::Gui
+        Qt::GuiPrivate
 )
 
 # Resources:
diff --git a/tests/manual/rhi/floattexture/CMakeLists.txt b/tests/manual/rhi/floattexture/CMakeLists.txt
index b87ddabab8..3368812524 100644
--- a/tests/manual/rhi/floattexture/CMakeLists.txt
+++ b/tests/manual/rhi/floattexture/CMakeLists.txt
@@ -8,10 +8,9 @@ add_qt_manual_test(floattexture
     GUI
     SOURCES
         floattexture.cpp
-    LIBRARIES
-        Qt::GuiPrivate
     PUBLIC_LIBRARIES
         Qt::Gui
+        Qt::GuiPrivate
 )
 
 # Resources:
diff --git a/tests/manual/rhi/instancing/CMakeLists.txt b/tests/manual/rhi/instancing/CMakeLists.txt
index f744daf900..8c8d0c2a9a 100644
--- a/tests/manual/rhi/instancing/CMakeLists.txt
+++ b/tests/manual/rhi/instancing/CMakeLists.txt
@@ -8,10 +8,9 @@ add_qt_manual_test(instancing
     GUI
     SOURCES
         instancing.cpp
-    LIBRARIES
-        Qt::GuiPrivate
     PUBLIC_LIBRARIES
         Qt::Gui
+        Qt::GuiPrivate
 )
 
 # Resources:
diff --git a/tests/manual/rhi/mrt/CMakeLists.txt b/tests/manual/rhi/mrt/CMakeLists.txt
index 74fd026166..db63ebe07d 100644
--- a/tests/manual/rhi/mrt/CMakeLists.txt
+++ b/tests/manual/rhi/mrt/CMakeLists.txt
@@ -8,10 +8,9 @@ add_qt_manual_test(mrt
     GUI
     SOURCES
         mrt.cpp
-    LIBRARIES
-        Qt::GuiPrivate
     PUBLIC_LIBRARIES
         Qt::Gui
+        Qt::GuiPrivate
 )
 
 # Resources:
diff --git a/tests/manual/rhi/msaarenderbuffer/CMakeLists.txt b/tests/manual/rhi/msaarenderbuffer/CMakeLists.txt
index 65a0388f80..26aa8798de 100644
--- a/tests/manual/rhi/msaarenderbuffer/CMakeLists.txt
+++ b/tests/manual/rhi/msaarenderbuffer/CMakeLists.txt
@@ -8,10 +8,9 @@ add_qt_manual_test(msaarenderbuffer
     GUI
     SOURCES
         msaarenderbuffer.cpp
-    LIBRARIES
-        Qt::GuiPrivate
     PUBLIC_LIBRARIES
         Qt::Gui
+        Qt::GuiPrivate
 )
 
 # Resources:
diff --git a/tests/manual/rhi/msaatexture/CMakeLists.txt b/tests/manual/rhi/msaatexture/CMakeLists.txt
index 79dc9d6168..5a3c447db4 100644
--- a/tests/manual/rhi/msaatexture/CMakeLists.txt
+++ b/tests/manual/rhi/msaatexture/CMakeLists.txt
@@ -8,10 +8,9 @@ add_qt_manual_test(msaatexture
     GUI
     SOURCES
         msaatexture.cpp
-    LIBRARIES
-        Qt::GuiPrivate
     PUBLIC_LIBRARIES
         Qt::Gui
+        Qt::GuiPrivate
 )
 
 # Resources:
diff --git a/tests/manual/rhi/multiwindow/CMakeLists.txt b/tests/manual/rhi/multiwindow/CMakeLists.txt
index 67bd6d82be..a3e63b9d06 100644
--- a/tests/manual/rhi/multiwindow/CMakeLists.txt
+++ b/tests/manual/rhi/multiwindow/CMakeLists.txt
@@ -8,10 +8,9 @@ add_qt_manual_test(multiwindow
     GUI
     SOURCES
         multiwindow.cpp
-    LIBRARIES
-        Qt::GuiPrivate
     PUBLIC_LIBRARIES
         Qt::Gui
+        Qt::GuiPrivate
         Qt::Widgets
 )
 
diff --git a/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt b/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt
index 39224ef40c..f3f220dba6 100644
--- a/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt
+++ b/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt
@@ -9,10 +9,9 @@ add_qt_manual_test(multiwindow_threaded
     SOURCES
         multiwindow_threaded.cpp
         window.cpp window.h
-    LIBRARIES
-        Qt::GuiPrivate
     PUBLIC_LIBRARIES
         Qt::Gui
+        Qt::GuiPrivate
         Qt::Widgets
 )
 
diff --git a/tests/manual/rhi/offscreen/CMakeLists.txt b/tests/manual/rhi/offscreen/CMakeLists.txt
index ceefc4c0d6..56a9f2661d 100644
--- a/tests/manual/rhi/offscreen/CMakeLists.txt
+++ b/tests/manual/rhi/offscreen/CMakeLists.txt
@@ -7,10 +7,9 @@
 add_qt_manual_test(offscreen
     SOURCES
         offscreen.cpp
-    LIBRARIES
-        Qt::GuiPrivate
     PUBLIC_LIBRARIES
         Qt::Gui
+        Qt::GuiPrivate
 )
 
 # Resources:
diff --git a/tests/manual/rhi/qrhiprof/CMakeLists.txt b/tests/manual/rhi/qrhiprof/CMakeLists.txt
index d0a11e94b3..8f4fb3797b 100644
--- a/tests/manual/rhi/qrhiprof/CMakeLists.txt
+++ b/tests/manual/rhi/qrhiprof/CMakeLists.txt
@@ -8,10 +8,9 @@ add_qt_manual_test(qrhiprof
     GUI
     SOURCES
         qrhiprof.cpp
-    LIBRARIES
-        Qt::GuiPrivate
     PUBLIC_LIBRARIES
         Qt::Gui
+        Qt::GuiPrivate
         Qt::Network
         Qt::Widgets
 )
diff --git a/tests/manual/rhi/shadowmap/CMakeLists.txt b/tests/manual/rhi/shadowmap/CMakeLists.txt
index 2f80d0209d..d2de92d094 100644
--- a/tests/manual/rhi/shadowmap/CMakeLists.txt
+++ b/tests/manual/rhi/shadowmap/CMakeLists.txt
@@ -8,10 +8,9 @@ add_qt_manual_test(shadowmap
     GUI
     SOURCES
         shadowmap.cpp
-    LIBRARIES
-        Qt::GuiPrivate
     PUBLIC_LIBRARIES
         Qt::Gui
+        Qt::GuiPrivate
 )
 
 # Resources:
diff --git a/tests/manual/rhi/texuploads/CMakeLists.txt b/tests/manual/rhi/texuploads/CMakeLists.txt
index c2efd3a1ea..2e97336a9d 100644
--- a/tests/manual/rhi/texuploads/CMakeLists.txt
+++ b/tests/manual/rhi/texuploads/CMakeLists.txt
@@ -8,10 +8,9 @@ add_qt_manual_test(texuploads
     GUI
     SOURCES
         texuploads.cpp
-    LIBRARIES
-        Qt::GuiPrivate
     PUBLIC_LIBRARIES
         Qt::Gui
+        Qt::GuiPrivate
 )
 
 # Resources:
diff --git a/tests/manual/rhi/triquadcube/CMakeLists.txt b/tests/manual/rhi/triquadcube/CMakeLists.txt
index 584f9aa4c7..42ebf1f55f 100644
--- a/tests/manual/rhi/triquadcube/CMakeLists.txt
+++ b/tests/manual/rhi/triquadcube/CMakeLists.txt
@@ -12,10 +12,9 @@ add_qt_manual_test(triquadcube
         triangleoncuberenderer.cpp triangleoncuberenderer.h
         trianglerenderer.cpp trianglerenderer.h
         triquadcube.cpp
-    LIBRARIES
-        Qt::GuiPrivate
     PUBLIC_LIBRARIES
         Qt::Gui
+        Qt::GuiPrivate
 )
 
 # Resources: