2 files changed, 49 insertions, 26 deletions
diff --git a/examples/qpa/qrasterwindow/CMakeLists.txt b/examples/qpa/qrasterwindow/CMakeLists.txt
index 0eae5b28af..c74ce2974b 100644
--- a/examples/qpa/qrasterwindow/CMakeLists.txt
+++ b/examples/qpa/qrasterwindow/CMakeLists.txt
@@ -1,15 +1,24 @@
 # Generated from qrasterwindow.pro.
 
-#####################################################################
-## qrasterwindow Binary:
-#####################################################################
-
-add_qt_executable(qrasterwindow
-    GUI
-    OUTPUT_DIRECTORY "${INSTALL_EXAMPLESDIR}/qpa/qrasterwindow"
-    INSTALL_DIRECTORY "${INSTALL_EXAMPLESDIR}/qpa/qrasterwindow"
-    SOURCES
-        main.cpp
-    LIBRARIES
-        Qt::Gui # special case
+cmake_minimum_required(VERSION 3.14)
+project(qrasterwindow LANGUAGES CXX)
+
+find_package(Qt5 COMPONENTS Gui) # special case
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples")
+
+add_executable(qrasterwindow WIN32 MACOSX_BUNDLE
+    main.cpp
+)
+target_link_libraries(qrasterwindow PUBLIC Qt::Gui) # special case: add
+
+install(TARGETS qrasterwindow
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
diff --git a/examples/qpa/windows/CMakeLists.txt b/examples/qpa/windows/CMakeLists.txt
index 55135e02ff..2bd7b6fd85 100644
--- a/examples/qpa/windows/CMakeLists.txt
+++ b/examples/qpa/windows/CMakeLists.txt
@@ -1,19 +1,33 @@
 # Generated from windows.pro.
 
-#####################################################################
-## windows Binary:
-#####################################################################
+cmake_minimum_required(VERSION 3.14)
+project(windows LANGUAGES CXX)
 
-add_qt_executable(windows
-    OUTPUT_DIRECTORY "${INSTALL_EXAMPLESDIR}/qpa/windows"
-    INSTALL_DIRECTORY "${INSTALL_EXAMPLESDIR}/qpa/windows"
-    SOURCES
-        main.cpp
-        window.cpp window.h
-    LIBRARIES
-        Qt::GuiPrivate
-        Qt::CorePrivate
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples")
+
+find_package(Qt5 COMPONENTS Gui)
+find_package(Qt5 COMPONENTS Core)
+
+add_executable(windows
+    main.cpp
+    window.cpp window.h
+)
+target_link_libraries(windows PRIVATE
+    Qt::CorePrivate
+    Qt::GuiPrivate
+)
+target_link_libraries(windows PUBLIC
+    Qt::Core
+    Qt::Gui
 )
 
-#### Keys ignored in scope 1:.:windows.pro:<NONE>:
-# CONFIG = "console"
+install(TARGETS windows
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
+)