Post merge fixes

Change-Id: I78d3c9687f99c0a32da04257e297e88ef0b02581
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

10 files changed, 60 insertions, 5 deletions

diff --git a/tests/manual/cocoa/menus/CMakeLists.txt b/tests/manual/cocoa/menus/CMakeLists.txt
index 61937f4724..a3fa70ba5d 100644
--- a/tests/manual/cocoa/menus/CMakeLists.txt
+++ b/tests/manual/cocoa/menus/CMakeLists.txt
@@ -5,7 +5,6 @@
 #####################################################################
 
 add_qt_manual_test(menus
-    GUI
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/cocoa/popups/CMakeLists.txt b/tests/manual/cocoa/popups/CMakeLists.txt
index 5fce692a96..53468edc7c 100644
--- a/tests/manual/cocoa/popups/CMakeLists.txt
+++ b/tests/manual/cocoa/popups/CMakeLists.txt
@@ -5,7 +5,6 @@
 #####################################################################
 
 add_qt_manual_test(popups
-    GUI
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/embeddedintoforeignwindow/CMakeLists.txt b/tests/manual/embeddedintoforeignwindow/CMakeLists.txt
index 34790ef69a..a40a655f4d 100644
--- a/tests/manual/embeddedintoforeignwindow/CMakeLists.txt
+++ b/tests/manual/embeddedintoforeignwindow/CMakeLists.txt
@@ -17,6 +17,7 @@ add_qt_manual_test(embeddedintoforeignwindow
     INCLUDE_DIRECTORIES
         ../diaglib
     LIBRARIES
+        Qt::CorePrivate
         Qt::GuiPrivate
     PUBLIC_LIBRARIES
         Qt::Gui
diff --git a/tests/manual/foreignwindows/CMakeLists.txt b/tests/manual/foreignwindows/CMakeLists.txt
index 7287b6582f..707d7e7056 100644
--- a/tests/manual/foreignwindows/CMakeLists.txt
+++ b/tests/manual/foreignwindows/CMakeLists.txt
@@ -15,6 +15,9 @@ add_qt_manual_test(foreignwindows
         QT_DIAG_LIB
     INCLUDE_DIRECTORIES
         ../diaglib
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
     PUBLIC_LIBRARIES
         Qt::Gui
         Qt::Widgets
diff --git a/tests/manual/qcursor/qcursorhighdpi/CMakeLists.txt b/tests/manual/qcursor/qcursorhighdpi/CMakeLists.txt
index 31b8a365b4..30594c8e0b 100644
--- a/tests/manual/qcursor/qcursorhighdpi/CMakeLists.txt
+++ b/tests/manual/qcursor/qcursorhighdpi/CMakeLists.txt
@@ -5,7 +5,6 @@
 #####################################################################
 
 add_qt_manual_test(qcursorhighdpi
-    GUI
     SOURCES
         main.cpp
     LIBRARIES
diff --git a/tests/manual/qnetconmonitor/.prev_CMakeLists.txt b/tests/manual/qnetconmonitor/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..ac9e963905
--- /dev/null
+++ b/tests/manual/qnetconmonitor/.prev_CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from qnetconmonitor.pro.
+
+#####################################################################
+## qnetconmonitor Binary:
+#####################################################################
+
+add_qt_manual_test(qnetconmonitor
+    SOURCES
+        tst_qnetconmonitor.cpp
+    LIBRARIES
+        Qt::NetworkPrivate
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qnetconmonitor.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/qnetworkreply/.prev_CMakeLists.txt b/tests/manual/qnetworkreply/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..f291a6aac2
--- /dev/null
+++ b/tests/manual/qnetworkreply/.prev_CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from qnetworkreply.pro.
+
+#####################################################################
+## tst_manual_qnetworkreply Binary:
+#####################################################################
+
+add_qt_manual_test(tst_manual_qnetworkreply
+    SOURCES
+        main.cpp
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::NetworkPrivate
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qnetworkreply.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/socketengine/.prev_CMakeLists.txt b/tests/manual/socketengine/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..1540a1f552
--- /dev/null
+++ b/tests/manual/socketengine/.prev_CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from socketengine.pro.
+
+#####################################################################
+## tst_socketengine Binary:
+#####################################################################
+
+add_qt_manual_test(tst_socketengine
+    SOURCES
+        main.cpp
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::NetworkPrivate
+    PUBLIC_LIBRARIES
+        Qt::Network
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:socketengine.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/manual/textrendering/nativetext/CMakeLists.txt b/tests/manual/textrendering/nativetext/CMakeLists.txt
index d56ba2d0bd..c7d50f2a6f 100644
--- a/tests/manual/textrendering/nativetext/CMakeLists.txt
+++ b/tests/manual/textrendering/nativetext/CMakeLists.txt
@@ -5,7 +5,6 @@
 #####################################################################
 
 add_qt_manual_test(nativetext
-    GUI
     SOURCES
         main.cpp
     LIBRARIES
diff --git a/tests/manual/touch/CMakeLists.txt b/tests/manual/touch/CMakeLists.txt
index 4b6d92abf0..5f7e9ec286 100644
--- a/tests/manual/touch/CMakeLists.txt
+++ b/tests/manual/touch/CMakeLists.txt
@@ -5,7 +5,6 @@
 #####################################################################
 
 add_qt_manual_test(touch
-    GUI
     SOURCES
         main.cpp
     PUBLIC_LIBRARIES