Re-generate the CMake project files

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

34 files changed, 215 insertions, 31 deletions

diff --git a/.prev_CMakeLists.txt b/.prev_CMakeLists.txt
index 06e2911..3835798 100644
--- a/.prev_CMakeLists.txt
+++ b/.prev_CMakeLists.txt
@@ -1,6 +1,6 @@
 # Generated from qtactiveqt.pro.
 
-cmake_minimum_required(VERSION 3.15.0)
+cmake_minimum_required(VERSION 3.16)
 
 include(.cmake.conf)
 project(activeqt_FIXME
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c822ad3..8226e14 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Generated from qtactiveqt.pro.
 
-cmake_minimum_required(VERSION 3.15.0)
+cmake_minimum_required(VERSION 3.16)
 
 include(".cmake.conf")
 project(QtActiveQt # special case
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
diff --git a/src/activeqt/CMakeLists.txt b/src/activeqt/CMakeLists.txt
index 5034157..fc6b167 100644
--- a/src/activeqt/CMakeLists.txt
+++ b/src/activeqt/CMakeLists.txt
@@ -5,8 +5,8 @@ add_subdirectory(axbase)
 add_subdirectory(control)
 add_subdirectory(container)
 
-qt_add_module(ActiveQt HEADER_MODULE MODULE_INCLUDE_NAME ActiveQt)
-qt_add_docs(ActiveQt
+qt_internal_add_module(ActiveQt HEADER_MODULE MODULE_INCLUDE_NAME ActiveQt)
+qt_internal_add_docs(ActiveQt
     doc/activeqt.qdocconf
 )
 # special case end
diff --git a/src/activeqt/axbase/CMakeLists.txt b/src/activeqt/axbase/CMakeLists.txt
index 787d240..65a71b3 100644
--- a/src/activeqt/axbase/CMakeLists.txt
+++ b/src/activeqt/axbase/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## AxBase Module:
 #####################################################################
 
-qt_add_module(AxBase
+qt_internal_add_module(AxBase # special case
     STATIC
     INTERNAL_MODULE
     SOURCES
diff --git a/src/activeqt/container/CMakeLists.txt b/src/activeqt/container/CMakeLists.txt
index 0f2ac6d..da04320 100644
--- a/src/activeqt/container/CMakeLists.txt
+++ b/src/activeqt/container/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## AxContainer Module:
 #####################################################################
 
-qt_add_module(AxContainer
+qt_internal_add_module(AxContainer # special case
     STATIC
     QMAKE_MODULE_CONFIG dumpcpp
     SOURCES
diff --git a/src/activeqt/control/CMakeLists.txt b/src/activeqt/control/CMakeLists.txt
index c33411d..e4b0254 100644
--- a/src/activeqt/control/CMakeLists.txt
+++ b/src/activeqt/control/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## AxServer Module:
 #####################################################################
 
-qt_add_module(AxServer
+qt_internal_add_module(AxServer # special case
     STATIC
     QMAKE_MODULE_CONFIG idcidl force_import_plugins
     SOURCES
diff --git a/src/tools/idc/.prev_CMakeLists.txt b/src/tools/idc/.prev_CMakeLists.txt
new file mode 100644
index 0000000..2cdd3d6
--- /dev/null
+++ b/src/tools/idc/.prev_CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from idc.pro.
+
+#####################################################################
+## idc Tool:
+#####################################################################
+
+qt_get_tool_target_name(target_name idc)
+qt_add_tool(${target_name}
+    BOOTSTRAP
+    TARGET_DESCRIPTION "Active Qt Interface Description Compiler"
+    SOURCES
+        main.cpp
+)
+
+#### Keys ignored in scope 1:.:.:idc.pro:<TRUE>:
+# QMAKE_TARGET_DESCRIPTION = "Active Qt Interface Description Compiler"
+# _OPTION = "host_build"
diff --git a/src/tools/idc/CMakeLists.txt b/src/tools/idc/CMakeLists.txt
index 607404f..d21b9f0 100644
--- a/src/tools/idc/CMakeLists.txt
+++ b/src/tools/idc/CMakeLists.txt
@@ -4,8 +4,10 @@
 ## idc Tool:
 #####################################################################
 
-qt_add_tool(idc
+qt_get_tool_target_name(target_name idc)
+qt_internal_add_tool(${target_name} # special case
 #    BOOTSTRAP # special case
+    TARGET_DESCRIPTION "Active Qt Interface Description Compiler"
     TOOLS_TARGET AxContainer # special case
     SOURCES
         main.cpp
diff --git a/tests/auto/.prev_CMakeLists.txt b/tests/auto/.prev_CMakeLists.txt
new file mode 100644
index 0000000..adb25cf
--- /dev/null
+++ b/tests/auto/.prev_CMakeLists.txt
@@ -0,0 +1,9 @@
+# Generated from auto.pro.
+
+add_subdirectory(conversion)
+add_subdirectory(qaxobject)
+add_subdirectory(dumpcpp)
+add_subdirectory(cmake)
+if(NOT GCC)
+    add_subdirectory(qaxscript)
+endif()
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index 8537f4f..2502019 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -3,7 +3,7 @@
 add_subdirectory(conversion)
 add_subdirectory(qaxobject)
 # add_subdirectory(dumpcpp) (needs typelib target) # special case
-#add_subdirectory(cmake) # special case
+# add_subdirectory(cmake) # special case
 if(NOT GCC)
     add_subdirectory(qaxscript)
 endif()
diff --git a/tests/auto/conversion/CMakeLists.txt b/tests/auto/conversion/CMakeLists.txt
index 4aab821..54da953 100644
--- a/tests/auto/conversion/CMakeLists.txt
+++ b/tests/auto/conversion/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## conversion Test:
 #####################################################################
 
-qt_add_test(conversion
+qt_internal_add_test(conversion # special case
     SOURCES
         tst_conversion.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qaxobject/CMakeLists.txt b/tests/auto/qaxobject/CMakeLists.txt
index 7c07415..6c1fe7d 100644
--- a/tests/auto/qaxobject/CMakeLists.txt
+++ b/tests/auto/qaxobject/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qaxobject Test:
 #####################################################################
 
-qt_add_test(qaxobject
+qt_internal_add_test(qaxobject # special case
     SOURCES
         tst_qaxobject.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/auto/qaxscript/CMakeLists.txt b/tests/auto/qaxscript/CMakeLists.txt
index 4312217..bfc512d 100644
--- a/tests/auto/qaxscript/CMakeLists.txt
+++ b/tests/auto/qaxscript/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## qaxscript Test:
 #####################################################################
 
-qt_add_test(qaxscript
+qt_internal_add_test(qaxscript # special case
     SOURCES
         tst_qaxscript.cpp
     PUBLIC_LIBRARIES
diff --git a/tests/manual/axviewer/.prev_CMakeLists.txt b/tests/manual/axviewer/.prev_CMakeLists.txt
index 8864fee..bcbe193 100644
--- a/tests/manual/axviewer/.prev_CMakeLists.txt
+++ b/tests/manual/axviewer/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
 ## axviewer Binary:
 #####################################################################
 
-qt_add_executable(axviewer
+qt_add_manual_test(axviewer
     SOURCES
         ../shared/metaobjectdump.cpp ../shared/metaobjectdump.h
         ../shared/textdialog.cpp ../shared/textdialog.h
diff --git a/tests/manual/axviewer/CMakeLists.txt b/tests/manual/axviewer/CMakeLists.txt
index f34e32c..06ab7e0 100644
--- a/tests/manual/axviewer/CMakeLists.txt
+++ b/tests/manual/axviewer/CMakeLists.txt
@@ -4,8 +4,7 @@
 ## axviewer Binary:
 #####################################################################
 
-# qt_add_executable(axviewer # special case
-qt_add_manual_test(axviewer # special case
+qt_internal_add_manual_test(axviewer # special case
     SOURCES
         ../shared/metaobjectdump.cpp ../shared/metaobjectdump.h
         ../shared/textdialog.cpp ../shared/textdialog.h
diff --git a/tests/manual/dumpcpp/CMakeLists.txt b/tests/manual/dumpcpp/CMakeLists.txt
index bc681d9..44e94a8 100644
--- a/tests/manual/dumpcpp/CMakeLists.txt
+++ b/tests/manual/dumpcpp/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## dumpcpp Binary:
 #####################################################################
 
-qt_add_executable(dumpcpp
+qt_internal_add_manual_test(dumpcpp # special case
     SOURCES
         ../shared/metaobjectdump.cpp ../shared/metaobjectdump.h
         ../shared/textdialog.cpp ../shared/textdialog.h
diff --git a/tests/manual/testcontrol/CMakeLists.txt b/tests/manual/testcontrol/CMakeLists.txt
index 3115e4d..ecf0192 100644
--- a/tests/manual/testcontrol/CMakeLists.txt
+++ b/tests/manual/testcontrol/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testcontrol Binary:
 #####################################################################
 
-qt_add_executable(testcontrol
+qt_internal_add_manual_test(testcontrol # special case
     GUI
     SOURCES
         main.cpp
diff --git a/tools/dumpcpp/.prev_CMakeLists.txt b/tools/dumpcpp/.prev_CMakeLists.txt
new file mode 100644
index 0000000..dd38bd9
--- /dev/null
+++ b/tools/dumpcpp/.prev_CMakeLists.txt
@@ -0,0 +1,24 @@
+# Generated from dumpcpp.pro.
+
+#####################################################################
+## dumpcpp Tool:
+#####################################################################
+
+qt_get_tool_target_name(target_name dumpcpp)
+qt_add_tool(${target_name}
+    TARGET_DESCRIPTION "Active Qt DumpCpp"
+    SOURCES
+        main.cpp
+        moc.cpp moc.h
+    DEFINES
+        QT_ASCII_CAST_WARNINGS
+        QT_NO_CAST_TO_ASCII
+    PUBLIC_LIBRARIES
+        Qt::AxContainer
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:dumpcpp.pro:<TRUE>:
+# QMAKE_TARGET_DESCRIPTION = "Active Qt DumpCpp"
diff --git a/tools/dumpcpp/CMakeLists.txt b/tools/dumpcpp/CMakeLists.txt
index 6c13386..8d8db8f 100644
--- a/tools/dumpcpp/CMakeLists.txt
+++ b/tools/dumpcpp/CMakeLists.txt
@@ -4,7 +4,9 @@
 ## dumpcpp Tool:
 #####################################################################
 
-qt_add_tool(dumpcpp
+qt_get_tool_target_name(target_name dumpcpp)
+qt_internal_add_tool(${target_name} # special case
+    TARGET_DESCRIPTION "Active Qt DumpCpp"
     TOOLS_TARGET AxContainer # special case
     SOURCES
         main.cpp
diff --git a/tools/dumpdoc/.prev_CMakeLists.txt b/tools/dumpdoc/.prev_CMakeLists.txt
new file mode 100644
index 0000000..ac903a6
--- /dev/null
+++ b/tools/dumpdoc/.prev_CMakeLists.txt
@@ -0,0 +1,19 @@
+# Generated from dumpdoc.pro.
+
+#####################################################################
+## dumpdoc Tool:
+#####################################################################
+
+qt_get_tool_target_name(target_name dumpdoc)
+qt_add_tool(${target_name}
+    TARGET_DESCRIPTION "Active Qt DumpDoc"
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::AxContainer
+        Qt::Gui
+        Qt::Widgets
+)
+
+#### Keys ignored in scope 1:.:.:dumpdoc.pro:<TRUE>:
+# QMAKE_TARGET_DESCRIPTION = "Active Qt DumpDoc"
diff --git a/tools/dumpdoc/CMakeLists.txt b/tools/dumpdoc/CMakeLists.txt
index 5ee059e..073ce62 100644
--- a/tools/dumpdoc/CMakeLists.txt
+++ b/tools/dumpdoc/CMakeLists.txt
@@ -4,7 +4,9 @@
 ## dumpdoc Tool:
 #####################################################################
 
-qt_add_tool(dumpdoc
+qt_get_tool_target_name(target_name dumpdoc)
+qt_internal_add_tool(${target_name} # special case
+    TARGET_DESCRIPTION "Active Qt DumpDoc"
     TOOLS_TARGET AxContainer # special case
     SOURCES
         main.cpp
diff --git a/tools/testcon/.prev_CMakeLists.txt b/tools/testcon/.prev_CMakeLists.txt
new file mode 100644
index 0000000..f5acf7d
--- /dev/null
+++ b/tools/testcon/.prev_CMakeLists.txt
@@ -0,0 +1,53 @@
+# Generated from testcon.pro.
+
+#####################################################################
+## testcon Binary:
+#####################################################################
+
+qt_add_executable(testcon
+    GUI
+    OUTPUT_DIRECTORY "$$[QT_INSTALL_BINS]"
+    INSTALL_DIRECTORY "$$[QT_INSTALL_BINS]"
+    SOURCES
+        ambientproperties.cpp ambientproperties.h ambientproperties.ui
+        changeproperties.cpp changeproperties.h changeproperties.ui
+        controlinfo.cpp controlinfo.h controlinfo.ui
+        docuwindow.cpp docuwindow.h
+        invokemethod.cpp invokemethod.h invokemethod.ui
+        main.cpp
+        mainwindow.cpp mainwindow.h mainwindow.ui
+    PUBLIC_LIBRARIES
+        Qt::AxContainer
+        Qt::AxContainerPrivate
+        Qt::AxServer
+        Qt::Gui
+        Qt::PrintSupport
+        Qt::Widgets
+    ENABLE_AUTOGEN_TOOLS
+        uic
+)
+
+# Resources:
+set(testcon_resource_files
+    "images/controlmethods.png"
+    "images/controlproperties.png"
+    "images/filenew.png"
+)
+
+qt_add_resource(testcon "testcon"
+    PREFIX
+        "/"
+    FILES
+        ${testcon_resource_files}
+)
+
+
+#### Keys ignored in scope 1:.:.:testcon.pro:<TRUE>:
+# RC_FILE = "testcon.rc"
+# TEMPLATE = "app"
+
+## Scopes:
+#####################################################################
+
+#### Keys ignored in scope 2:.:.:testcon.pro:NOT MINGW:
+# QMAKE_POST_LINK = "midl" "$$shell_quote($$shell_path $$PWD/testcon.idl)" "&&" "move" "testcon.tlb" "$(TARGETDIR)"
diff --git a/tools/testcon/CMakeLists.txt b/tools/testcon/CMakeLists.txt
index 1a34519..5c709f2 100644
--- a/tools/testcon/CMakeLists.txt
+++ b/tools/testcon/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## testcon Binary:
 #####################################################################
 
-qt_add_executable(testcon
+qt_internal_add_executable(testcon # special case
     GUI
 #    OUTPUT_DIRECTORY "$$[QT_INSTALL_BINS]" # special case
 #    INSTALL_DIRECTORY "$$[QT_INSTALL_BINS]" # special case
@@ -34,7 +34,7 @@ set(testcon_resource_files
     "images/filenew.png"
 )
 
-qt_add_resource(testcon "testcon"
+qt_internal_add_resource(testcon "testcon" # special case
     PREFIX
         "/"
     FILES
@@ -49,5 +49,5 @@ qt_add_resource(testcon "testcon"
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 2:.:.:testcon.pro:NOT mingw:
+#### Keys ignored in scope 2:.:.:testcon.pro:NOT MINGW:
 # QMAKE_POST_LINK = "midl" "$$shell_quote($$shell_path $$PWD/testcon.idl)" "&&" "move" "testcon.tlb" "$(TARGETDIR)"