Re-generate the CMake project files

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

11 files changed, 66 insertions, 9 deletions

diff --git a/examples/activeqt/.prev_CMakeLists.txt b/examples/activeqt/.prev_CMakeLists.txt
new file mode 100644
index 0000000..657ff2b
--- /dev/null
+++ b/examples/activeqt/.prev_CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from activeqt.pro.
+
+add_subdirectory(comapp)
+add_subdirectory(hierarchy)
+add_subdirectory(menus)
+add_subdirectory(multiple)
+add_subdirectory(simple)
+add_subdirectory(wrapper)
+if(MINGW OR QT_BUILD_SHARED_LIBS)
+    add_subdirectory(mediaplayer)
+endif()
+if(QT_CONFIG___contains___opengl AND NOT QT_CONFIG___contains___opengles2)
+    add_subdirectory(opengl)
+endif()
+if(TARGET Qt::QuickControls2)
+    add_subdirectory(simpleqml)
+endif()
diff --git a/examples/activeqt/comapp/CMakeLists.txt b/examples/activeqt/comapp/CMakeLists.txt
index d2100be..f27518c 100644
--- a/examples/activeqt/comapp/CMakeLists.txt
+++ b/examples/activeqt/comapp/CMakeLists.txt
@@ -20,9 +20,13 @@ find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS AxServer)
 find_package(Qt6 COMPONENTS Widgets)
 
-add_qt_gui_executable(comapp
+qt_add_executable(comapp
     main.cpp
 )
+set_target_properties(comapp PROPERTIES
+    WIN32_EXECUTABLE TRUE
+    MACOSX_BUNDLE TRUE
+)
 target_link_libraries(comapp PUBLIC
     Qt::AxServer
     Qt::Core
diff --git a/examples/activeqt/hierarchy/CMakeLists.txt b/examples/activeqt/hierarchy/CMakeLists.txt
index 0d6d006..839fa8e 100644
--- a/examples/activeqt/hierarchy/CMakeLists.txt
+++ b/examples/activeqt/hierarchy/CMakeLists.txt
@@ -20,10 +20,14 @@ find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 find_package(Qt6 COMPONENTS AxServer)
 
-add_qt_gui_executable(hierarchyax
+qt_add_executable(hierarchyax
     main.cpp
     objects.cpp objects.h
 )
+set_target_properties(hierarchyax PROPERTIES
+    WIN32_EXECUTABLE TRUE
+    MACOSX_BUNDLE TRUE
+)
 target_link_libraries(hierarchyax PUBLIC
     Qt::AxServer
     Qt::Core
diff --git a/examples/activeqt/mediaplayer/CMakeLists.txt b/examples/activeqt/mediaplayer/CMakeLists.txt
index 317ea40..acc01c1 100644
--- a/examples/activeqt/mediaplayer/CMakeLists.txt
+++ b/examples/activeqt/mediaplayer/CMakeLists.txt
@@ -20,11 +20,15 @@ find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 find_package(Qt6 COMPONENTS AxContainer)
 
-add_qt_gui_executable(mediaplayer
+qt_add_executable(mediaplayer
     main.cpp
     mainwindow.ui
     mediaaxwidget.h
 )
+set_target_properties(mediaplayer PROPERTIES
+    WIN32_EXECUTABLE TRUE
+    MACOSX_BUNDLE TRUE
+)
 target_link_libraries(mediaplayer PUBLIC
     Qt::AxContainer
     Qt::Core
diff --git a/examples/activeqt/menus/CMakeLists.txt b/examples/activeqt/menus/CMakeLists.txt
index 1bf6a6b..1d2a1cf 100644
--- a/examples/activeqt/menus/CMakeLists.txt
+++ b/examples/activeqt/menus/CMakeLists.txt
@@ -20,10 +20,14 @@ find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 find_package(Qt6 COMPONENTS AxServer)
 
-add_qt_gui_executable(menusax
+qt_add_executable(menusax
     main.cpp
     menus.cpp menus.h
 )
+set_target_properties(menusax PROPERTIES
+    WIN32_EXECUTABLE TRUE
+    MACOSX_BUNDLE TRUE
+)
 target_link_libraries(menusax PUBLIC
     Qt::AxServer
     Qt::Core
diff --git a/examples/activeqt/multiple/CMakeLists.txt b/examples/activeqt/multiple/CMakeLists.txt
index ac9f8a9..468ea99 100644
--- a/examples/activeqt/multiple/CMakeLists.txt
+++ b/examples/activeqt/multiple/CMakeLists.txt
@@ -20,11 +20,15 @@ find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 find_package(Qt6 COMPONENTS AxServer)
 
-add_qt_gui_executable(multipleax
+qt_add_executable(multipleax
     ax1.h
     ax2.h
     main.cpp
 )
+set_target_properties(multipleax PROPERTIES
+    WIN32_EXECUTABLE TRUE
+    MACOSX_BUNDLE TRUE
+)
 target_link_libraries(multipleax PUBLIC
     Qt::AxServer
     Qt::Core
diff --git a/examples/activeqt/opengl/CMakeLists.txt b/examples/activeqt/opengl/CMakeLists.txt
index 5c08b0c..b978cfe 100644
--- a/examples/activeqt/opengl/CMakeLists.txt
+++ b/examples/activeqt/opengl/CMakeLists.txt
@@ -22,11 +22,15 @@ find_package(Qt6 COMPONENTS AxServer)
 find_package(Qt6 COMPONENTS OpenGL)
 find_package(Qt6 COMPONENTS OpenGLWidgets)
 
-add_qt_gui_executable(openglax
+qt_add_executable(openglax
     glbox.cpp glbox.h
     globjwin.cpp globjwin.h
     main.cpp
 )
+set_target_properties(openglax PROPERTIES
+    WIN32_EXECUTABLE TRUE
+    MACOSX_BUNDLE TRUE
+)
 target_link_libraries(openglax PUBLIC
     Qt::AxServer
     Qt::Core
diff --git a/examples/activeqt/qutlook/CMakeLists.txt b/examples/activeqt/qutlook/CMakeLists.txt
index 3373330..af1de27 100644
--- a/examples/activeqt/qutlook/CMakeLists.txt
+++ b/examples/activeqt/qutlook/CMakeLists.txt
@@ -21,6 +21,10 @@ find_package(Qt6 COMPONENTS Widgets)
 find_package(Qt6 COMPONENTS AxContainer)
 
 )
+set_target_properties(qutlook PROPERTIES
+    WIN32_EXECUTABLE TRUE
+    MACOSX_BUNDLE TRUE
+)
 target_link_libraries(qutlook PUBLIC
     Qt::AxContainer
     Qt::Core
diff --git a/examples/activeqt/simple/CMakeLists.txt b/examples/activeqt/simple/CMakeLists.txt
index 600defb..12fd293 100644
--- a/examples/activeqt/simple/CMakeLists.txt
+++ b/examples/activeqt/simple/CMakeLists.txt
@@ -20,9 +20,13 @@ find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 find_package(Qt6 COMPONENTS AxServer)
 
-add_qt_gui_executable(simpleax
+qt_add_executable(simpleax
     main.cpp
 )
+set_target_properties(simpleax PROPERTIES
+    WIN32_EXECUTABLE TRUE
+    MACOSX_BUNDLE TRUE
+)
 target_link_libraries(simpleax PUBLIC
     Qt::AxServer
     Qt::Core
diff --git a/examples/activeqt/simpleqml/CMakeLists.txt b/examples/activeqt/simpleqml/CMakeLists.txt
index bc293ad..dec072e 100644
--- a/examples/activeqt/simpleqml/CMakeLists.txt
+++ b/examples/activeqt/simpleqml/CMakeLists.txt
@@ -22,9 +22,13 @@ find_package(Qt6 COMPONENTS AxServer)
 find_package(Qt6 COMPONENTS Quick)
 find_package(Qt6 COMPONENTS QuickWidgets)
 
-add_qt_gui_executable(simpleqmlax
+qt_add_executable(simpleqmlax
     main.cpp
 )
+set_target_properties(simpleqmlax PROPERTIES
+    WIN32_EXECUTABLE TRUE
+    MACOSX_BUNDLE TRUE
+)
 target_link_libraries(simpleqmlax PUBLIC
     Qt::AxServer
     Qt::Core
diff --git a/examples/activeqt/wrapper/CMakeLists.txt b/examples/activeqt/wrapper/CMakeLists.txt
index 4a43092..232a255 100644
--- a/examples/activeqt/wrapper/CMakeLists.txt
+++ b/examples/activeqt/wrapper/CMakeLists.txt
@@ -20,9 +20,13 @@ find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS Widgets)
 find_package(Qt6 COMPONENTS AxServer)
 
-add_qt_gui_executable(wrapperax
+qt_add_executable(wrapperax
     main.cpp
 )
+set_target_properties(wrapperax PROPERTIES
+    WIN32_EXECUTABLE TRUE
+    MACOSX_BUNDLE TRUE
+)
 target_link_libraries(wrapperax PUBLIC
     Qt::AxServer
     Qt::Core