Fix build of manual tests

Some manual tests were converted by pro2cmake and looked like example
projects and tried to install into examples.  Use
qt_internal_add_manual_test for those.

The qml-client test referred to a header file that has been renamed.

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

3 files changed, 17 insertions, 82 deletions

diff --git a/tests/manual/texture-sharing-2/custom-compositor/CMakeLists.txt b/tests/manual/texture-sharing-2/custom-compositor/CMakeLists.txt
index cd12ca0d..fd65b346 100644
--- a/tests/manual/texture-sharing-2/custom-compositor/CMakeLists.txt
+++ b/tests/manual/texture-sharing-2/custom-compositor/CMakeLists.txt
@@ -1,40 +1,13 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-# Generated from custom-compositor.pro.
-
-cmake_minimum_required(VERSION 3.16)
-project(texture-sharing-custom-compositor LANGUAGES CXX)
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
-
-if(NOT DEFINED INSTALL_EXAMPLESDIR)
-  set(INSTALL_EXAMPLESDIR "examples")
-endif()
-
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/wayland/texture-sharing/custom-compositor")
-
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS Qml)
-find_package(Qt6 COMPONENTS WaylandCompositor)
-
-qt_add_executable(texture-sharing-custom-compositor
-    main.cpp
-)
-set_target_properties(texture-sharing-custom-compositor PROPERTIES
-    WIN32_EXECUTABLE TRUE
-    MACOSX_BUNDLE TRUE
-)
-target_link_libraries(texture-sharing-custom-compositor PUBLIC
-    Qt::Core
-    Qt::Gui
-    Qt::Qml
-    Qt::WaylandCompositorPrivate
+qt_internal_add_manual_test(texture-sharing-custom-compositor
+    GUI
+    SOURCES
+        main.cpp
+    LIBRARIES
+        Qt::Qml
+        Qt::WaylandCompositorPrivate
 )
 
 
@@ -47,15 +20,9 @@ set(compositor_resource_files
     "qml/main.qml"
 )
 
-qt6_add_resources(texture-sharing-custom-compositor "compositor"
+qt_internal_add_resource(texture-sharing-custom-compositor "compositor"
     PREFIX
         "/"
     FILES
         ${compositor_resource_files}
 )
-
-install(TARGETS texture-sharing-custom-compositor
-    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
-    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
-    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
-)
diff --git a/tests/manual/texture-sharing-2/qml-client/CMakeLists.txt b/tests/manual/texture-sharing-2/qml-client/CMakeLists.txt
index 811feb33..5c25d970 100644
--- a/tests/manual/texture-sharing-2/qml-client/CMakeLists.txt
+++ b/tests/manual/texture-sharing-2/qml-client/CMakeLists.txt
@@ -1,55 +1,22 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-# Generated from qml-client.pro.
-
-cmake_minimum_required(VERSION 3.16)
-project(qml-client LANGUAGES CXX)
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
-
-if(NOT DEFINED INSTALL_EXAMPLESDIR)
-  set(INSTALL_EXAMPLESDIR "examples")
-endif()
-
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/wayland/texture-sharing/qml-client")
-
-find_package(Qt6 COMPONENTS Core)
-find_package(Qt6 COMPONENTS Gui)
-find_package(Qt6 COMPONENTS Quick)
-
-qt_add_executable(qml-client
-    main.cpp
-)
-set_target_properties(qml-client PROPERTIES
-    WIN32_EXECUTABLE TRUE
-    MACOSX_BUNDLE TRUE
-)
-target_link_libraries(qml-client PUBLIC
-    Qt::Core
-    Qt::Gui
-    Qt::Quick
+qt_internal_add_manual_test(qml-client
+    GUI
+    SOURCES
+        main.cpp
+    LIBRARIES
+        Qt::Quick
 )
 
-
 # Resources:
 set(qml-client_resource_files
     "main.qml"
 )
 
-qt6_add_resources(qml-client "qml-client"
+qt_internal_add_resource(qml-client "qml-client"
     PREFIX
         "/"
     FILES
         ${qml-client_resource_files}
 )
-
-install(TARGETS qml-client
-    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
-    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
-    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
-)
diff --git a/tests/manual/texture-sharing/cpp-client/CMakeLists.txt b/tests/manual/texture-sharing/cpp-client/CMakeLists.txt
index 4076cc75..30c4b0f5 100644
--- a/tests/manual/texture-sharing/cpp-client/CMakeLists.txt
+++ b/tests/manual/texture-sharing/cpp-client/CMakeLists.txt
@@ -10,7 +10,8 @@
 qt_internal_add_manual_test(cpp-client
     GUI
     SOURCES
-        ../../../../src/imports/texture-sharing/texturesharingextension.cpp ../../../../src/imports/texture-sharing/texturesharingextension.h
+        ../../../../src/imports/texture-sharing/texturesharingextension.cpp
+        ../../../../src/imports/texture-sharing/texturesharingextension_p.h
         main.cpp
     INCLUDE_DIRECTORIES
         ../../../../src/imports/texture-sharing