diff --git a/CMakeLists.txt b/CMakeLists.txt index 841ea3fa03f..09143fa5a82 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,9 +52,9 @@ if (QT_WILL_BUILD_TOOLS) add_subdirectory(qmake) endif() +qt_build_repo_end() + option(BUILD_EXAMPLES "Build Qt examples" ON) if (BUILD_EXAMPLES) add_subdirectory(examples) endif() - -qt_build_repo_end() diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index c0436866af9..67c80ab2d68 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -1349,9 +1349,11 @@ function(qt_export_tools module_name) set(tool_targets "") foreach(tool_name ${QT_KNOWN_MODULE_${module_name}_TOOLS}) set(extra_cmake_statements "${extra_cmake_statements} -get_property(is_global TARGET ${INSTALL_CMAKE_NAMESPACE}::${tool_name} PROPERTY IMPORTED_GLOBAL) -if(NOT is_global) - set_property(TARGET ${INSTALL_CMAKE_NAMESPACE}::${tool_name} PROPERTY IMPORTED_GLOBAL TRUE) +if (NOT QT_NO_CREATE_TARGETS) + get_property(is_global TARGET ${INSTALL_CMAKE_NAMESPACE}::${tool_name} PROPERTY IMPORTED_GLOBAL) + if(NOT is_global) + set_property(TARGET ${INSTALL_CMAKE_NAMESPACE}::${tool_name} PROPERTY IMPORTED_GLOBAL TRUE) + endif() endif() ") list(APPEND tool_targets "${QT_CMAKE_EXPORT_NAMESPACE}::${tool_name}") diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake index e4468aa3555..d6b65b5b381 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -81,11 +81,11 @@ macro(qt_build_repo) add_subdirectory(tests) endif() + qt_build_repo_end() + if (BUILD_EXAMPLES AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/examples/CMakeLists.txt") add_subdirectory(examples) endif() - - qt_build_repo_end() endmacro() macro(qt_set_up_standalone_tests_build) diff --git a/cmake/QtModuleConfig.cmake.in b/cmake/QtModuleConfig.cmake.in index 0522b7d1e23..4bbd485fc4c 100644 --- a/cmake/QtModuleConfig.cmake.in +++ b/cmake/QtModuleConfig.cmake.in @@ -9,12 +9,12 @@ get_filename_component(_import_prefix "${_import_prefix}" REALPATH) @extra_cmake_code@ # Extra cmake code end -if (NOT QT_NO_CREATE_TARGETS) - # Find required dependencies, if any. - if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@Dependencies.cmake") - include("${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@Dependencies.cmake") - endif() +# Find required dependencies, if any. +if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@Dependencies.cmake") + include("${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@Dependencies.cmake") +endif() +if (NOT QT_NO_CREATE_TARGETS) include("${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@Targets.cmake") include("${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@VersionlessTargets.cmake") endif() diff --git a/examples/corelib/ipc/localfortuneclient/CMakeLists.txt b/examples/corelib/ipc/localfortuneclient/CMakeLists.txt index ae0492fe260..a171965bbba 100644 --- a/examples/corelib/ipc/localfortuneclient/CMakeLists.txt +++ b/examples/corelib/ipc/localfortuneclient/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_executable(localfortuneclient WIN32 MACOSX_BUNDLE +add_qt_gui_executable(localfortuneclient WIN32 MACOSX_BUNDLE client.cpp client.h main.cpp ) diff --git a/examples/corelib/ipc/localfortuneserver/CMakeLists.txt b/examples/corelib/ipc/localfortuneserver/CMakeLists.txt index 11fcf4e2977..5804aa69faf 100644 --- a/examples/corelib/ipc/localfortuneserver/CMakeLists.txt +++ b/examples/corelib/ipc/localfortuneserver/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_executable(localfortuneserver WIN32 MACOSX_BUNDLE +add_qt_gui_executable(localfortuneserver WIN32 MACOSX_BUNDLE main.cpp server.cpp server.h ) diff --git a/examples/corelib/ipc/sharedmemory/CMakeLists.txt b/examples/corelib/ipc/sharedmemory/CMakeLists.txt index f4e37803480..55f42ada888 100644 --- a/examples/corelib/ipc/sharedmemory/CMakeLists.txt +++ b/examples/corelib/ipc/sharedmemory/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(sharedmemory WIN32 MACOSX_BUNDLE +add_qt_gui_executable(sharedmemory WIN32 MACOSX_BUNDLE dialog.cpp dialog.h dialog.ui main.cpp ) diff --git a/examples/corelib/mimetypes/mimetypebrowser/CMakeLists.txt b/examples/corelib/mimetypes/mimetypebrowser/CMakeLists.txt index 05e68e6d674..1493bdd31d3 100644 --- a/examples/corelib/mimetypes/mimetypebrowser/CMakeLists.txt +++ b/examples/corelib/mimetypes/mimetypebrowser/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(mimetypebrowser WIN32 MACOSX_BUNDLE +add_qt_gui_executable(mimetypebrowser WIN32 MACOSX_BUNDLE main.cpp mainwindow.cpp mainwindow.h mimetypemodel.cpp mimetypemodel.h diff --git a/examples/corelib/threads/mandelbrot/CMakeLists.txt b/examples/corelib/threads/mandelbrot/CMakeLists.txt index 9b5995b1a5f..cc0385a9ce3 100644 --- a/examples/corelib/threads/mandelbrot/CMakeLists.txt +++ b/examples/corelib/threads/mandelbrot/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(mandelbrot WIN32 MACOSX_BUNDLE +add_qt_gui_executable(mandelbrot WIN32 MACOSX_BUNDLE main.cpp mandelbrotwidget.cpp mandelbrotwidget.h renderthread.cpp renderthread.h diff --git a/examples/corelib/threads/queuedcustomtype/CMakeLists.txt b/examples/corelib/threads/queuedcustomtype/CMakeLists.txt index 9fc8234e4d9..ef07b36301a 100644 --- a/examples/corelib/threads/queuedcustomtype/CMakeLists.txt +++ b/examples/corelib/threads/queuedcustomtype/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(queuedcustomtype WIN32 MACOSX_BUNDLE +add_qt_gui_executable(queuedcustomtype WIN32 MACOSX_BUNDLE block.cpp block.h main.cpp renderthread.cpp renderthread.h diff --git a/examples/corelib/tools/contiguouscache/CMakeLists.txt b/examples/corelib/tools/contiguouscache/CMakeLists.txt index 62214a46d56..9b0638bea20 100644 --- a/examples/corelib/tools/contiguouscache/CMakeLists.txt +++ b/examples/corelib/tools/contiguouscache/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(contiguouscache WIN32 MACOSX_BUNDLE +add_qt_gui_executable(contiguouscache WIN32 MACOSX_BUNDLE main.cpp randomlistmodel.cpp randomlistmodel.h ) diff --git a/examples/corelib/tools/customtype/CMakeLists.txt b/examples/corelib/tools/customtype/CMakeLists.txt index 394534f5eef..2cab51c0732 100644 --- a/examples/corelib/tools/customtype/CMakeLists.txt +++ b/examples/corelib/tools/customtype/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(customtype WIN32 MACOSX_BUNDLE +add_qt_gui_executable(customtype WIN32 MACOSX_BUNDLE main.cpp message.cpp message.h ) diff --git a/examples/corelib/tools/customtypesending/CMakeLists.txt b/examples/corelib/tools/customtypesending/CMakeLists.txt index 53a39c57ce3..06ed26ba485 100644 --- a/examples/corelib/tools/customtypesending/CMakeLists.txt +++ b/examples/corelib/tools/customtypesending/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(customtypesending WIN32 MACOSX_BUNDLE +add_qt_gui_executable(customtypesending WIN32 MACOSX_BUNDLE main.cpp message.cpp message.h window.cpp window.h diff --git a/examples/dbus/chat/CMakeLists.txt b/examples/dbus/chat/CMakeLists.txt index 26388c51eb2..85da98583ca 100644 --- a/examples/dbus/chat/CMakeLists.txt +++ b/examples/dbus/chat/CMakeLists.txt @@ -27,7 +27,7 @@ qt5_add_dbus_adaptor(chat_SRCS chat_adaptor ) # special case end -add_executable(chat WIN32 MACOSX_BUNDLE +add_qt_gui_executable(chat WIN32 MACOSX_BUNDLE chat.cpp chat.h chatmainwindow.ui chatsetnickname.ui diff --git a/examples/dbus/complexpingpong/CMakeLists.txt b/examples/dbus/complexpingpong/CMakeLists.txt index 543af8491b9..fb96f826b47 100644 --- a/examples/dbus/complexpingpong/CMakeLists.txt +++ b/examples/dbus/complexpingpong/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS DBus) -add_executable(complexpong WIN32 MACOSX_BUNDLE +add_qt_gui_executable(complexpong WIN32 MACOSX_BUNDLE complexpong.cpp complexpong.h ) target_link_libraries(complexpong PUBLIC diff --git a/examples/dbus/listnames/CMakeLists.txt b/examples/dbus/listnames/CMakeLists.txt index 5fe935f24a1..c888a1df49a 100644 --- a/examples/dbus/listnames/CMakeLists.txt +++ b/examples/dbus/listnames/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS DBus) -add_executable(listnames WIN32 MACOSX_BUNDLE +add_qt_gui_executable(listnames WIN32 MACOSX_BUNDLE listnames.cpp ) target_link_libraries(listnames PUBLIC diff --git a/examples/dbus/pingpong/CMakeLists.txt b/examples/dbus/pingpong/CMakeLists.txt index e82fe78c514..1e93e3cef31 100644 --- a/examples/dbus/pingpong/CMakeLists.txt +++ b/examples/dbus/pingpong/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS DBus) -add_executable(pong WIN32 MACOSX_BUNDLE +add_qt_gui_executable(pong WIN32 MACOSX_BUNDLE ping-common.h pong.cpp pong.h ) diff --git a/examples/dbus/remotecontrolledcar/car/CMakeLists.txt b/examples/dbus/remotecontrolledcar/car/CMakeLists.txt index 9532d0cceec..cee3b2bb50e 100644 --- a/examples/dbus/remotecontrolledcar/car/CMakeLists.txt +++ b/examples/dbus/remotecontrolledcar/car/CMakeLists.txt @@ -23,7 +23,7 @@ qt5_add_dbus_adaptor(car_SRCS car_adaptor ) # special case end -add_executable(car WIN32 MACOSX_BUNDLE +add_qt_gui_executable(car WIN32 MACOSX_BUNDLE car.cpp car.h main.cpp ${car_SRCS} # special case diff --git a/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt b/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt index 00bf809392b..ee97e0d1e4c 100644 --- a/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt +++ b/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt @@ -21,7 +21,7 @@ qt5_add_dbus_interface(controller_SRCS car_interface ) # special case end -add_executable(controller WIN32 MACOSX_BUNDLE +add_qt_gui_executable(controller WIN32 MACOSX_BUNDLE controller.cpp controller.h controller.ui main.cpp ${controller_SRCS} # special case diff --git a/examples/embedded/digiflip/CMakeLists.txt b/examples/embedded/digiflip/CMakeLists.txt index bc94d6809ad..ee20c34c114 100644 --- a/examples/embedded/digiflip/CMakeLists.txt +++ b/examples/embedded/digiflip/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(digiflip WIN32 MACOSX_BUNDLE +add_qt_gui_executable(digiflip WIN32 MACOSX_BUNDLE digiflip.cpp ) target_link_libraries(digiflip PUBLIC diff --git a/examples/embedded/flickable/CMakeLists.txt b/examples/embedded/flickable/CMakeLists.txt index 8d5d9878f06..c71699b693a 100644 --- a/examples/embedded/flickable/CMakeLists.txt +++ b/examples/embedded/flickable/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(flickable WIN32 MACOSX_BUNDLE +add_qt_gui_executable(flickable WIN32 MACOSX_BUNDLE flickable.cpp flickable.h main.cpp ) diff --git a/examples/embedded/flightinfo/CMakeLists.txt b/examples/embedded/flightinfo/CMakeLists.txt index 9afc98df76a..e9055311143 100644 --- a/examples/embedded/flightinfo/CMakeLists.txt +++ b/examples/embedded/flightinfo/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_executable(flightinfo WIN32 MACOSX_BUNDLE +add_qt_gui_executable(flightinfo WIN32 MACOSX_BUNDLE flightinfo.cpp form.ui flightinfo.qrc # special case: add diff --git a/examples/embedded/lightmaps/CMakeLists.txt b/examples/embedded/lightmaps/CMakeLists.txt index 35171451bfc..ea7239b7ac9 100644 --- a/examples/embedded/lightmaps/CMakeLists.txt +++ b/examples/embedded/lightmaps/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_executable(lightmaps WIN32 MACOSX_BUNDLE +add_qt_gui_executable(lightmaps WIN32 MACOSX_BUNDLE lightmaps.cpp lightmaps.h main.cpp mapzoom.cpp mapzoom.h diff --git a/examples/embedded/raycasting/CMakeLists.txt b/examples/embedded/raycasting/CMakeLists.txt index 0578b6e0bd8..d27dbbe7a4f 100644 --- a/examples/embedded/raycasting/CMakeLists.txt +++ b/examples/embedded/raycasting/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(raycasting WIN32 MACOSX_BUNDLE +add_qt_gui_executable(raycasting WIN32 MACOSX_BUNDLE raycasting.cpp raycasting.qrc ) target_link_libraries(raycasting PUBLIC diff --git a/examples/embedded/styleexample/CMakeLists.txt b/examples/embedded/styleexample/CMakeLists.txt index 2210d8cf9b6..34ab6e4a223 100644 --- a/examples/embedded/styleexample/CMakeLists.txt +++ b/examples/embedded/styleexample/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(styleexample WIN32 MACOSX_BUNDLE +add_qt_gui_executable(styleexample WIN32 MACOSX_BUNDLE main.cpp stylewidget.cpp stylewidget.h stylewidget.ui styleexample.qrc # special case: add diff --git a/examples/gui/analogclock/CMakeLists.txt b/examples/gui/analogclock/CMakeLists.txt index d35b5a7502f..7fe1aed8dea 100644 --- a/examples/gui/analogclock/CMakeLists.txt +++ b/examples/gui/analogclock/CMakeLists.txt @@ -13,7 +13,7 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -add_executable(gui_analogclock WIN32 MACOSX_BUNDLE # special case: renamed target +add_qt_gui_executable(gui_analogclock WIN32 MACOSX_BUNDLE # special case: renamed target ../rasterwindow/rasterwindow.cpp ../rasterwindow/rasterwindow.h main.cpp ) diff --git a/examples/gui/openglwindow/CMakeLists.txt b/examples/gui/openglwindow/CMakeLists.txt index ee62a2c43e4..c77dabd0c1b 100644 --- a/examples/gui/openglwindow/CMakeLists.txt +++ b/examples/gui/openglwindow/CMakeLists.txt @@ -13,7 +13,7 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -add_executable(openglwindow WIN32 MACOSX_BUNDLE +add_qt_gui_executable(openglwindow WIN32 MACOSX_BUNDLE main.cpp openglwindow.cpp openglwindow.h ) diff --git a/examples/gui/rasterwindow/CMakeLists.txt b/examples/gui/rasterwindow/CMakeLists.txt index f200899fbdf..9ddf9163696 100644 --- a/examples/gui/rasterwindow/CMakeLists.txt +++ b/examples/gui/rasterwindow/CMakeLists.txt @@ -13,7 +13,7 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -add_executable(rasterwindow WIN32 MACOSX_BUNDLE +add_qt_gui_executable(rasterwindow WIN32 MACOSX_BUNDLE main.cpp rasterwindow.cpp rasterwindow.h ) diff --git a/examples/network/blockingfortuneclient/CMakeLists.txt b/examples/network/blockingfortuneclient/CMakeLists.txt index 603c7d9fd2a..47933d66ff4 100644 --- a/examples/network/blockingfortuneclient/CMakeLists.txt +++ b/examples/network/blockingfortuneclient/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_executable(blockingfortuneclient WIN32 MACOSX_BUNDLE +add_qt_gui_executable(blockingfortuneclient WIN32 MACOSX_BUNDLE blockingclient.cpp blockingclient.h fortunethread.cpp fortunethread.h main.cpp diff --git a/examples/network/broadcastreceiver/CMakeLists.txt b/examples/network/broadcastreceiver/CMakeLists.txt index 79075f35580..d8cdae0b42e 100644 --- a/examples/network/broadcastreceiver/CMakeLists.txt +++ b/examples/network/broadcastreceiver/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_executable(broadcastreceiver WIN32 MACOSX_BUNDLE +add_qt_gui_executable(broadcastreceiver WIN32 MACOSX_BUNDLE main.cpp receiver.cpp receiver.h ) diff --git a/examples/network/broadcastsender/CMakeLists.txt b/examples/network/broadcastsender/CMakeLists.txt index f6da1a57333..31681c29c33 100644 --- a/examples/network/broadcastsender/CMakeLists.txt +++ b/examples/network/broadcastsender/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_executable(broadcastsender WIN32 MACOSX_BUNDLE +add_qt_gui_executable(broadcastsender WIN32 MACOSX_BUNDLE main.cpp sender.cpp sender.h ) diff --git a/examples/network/fortuneclient/CMakeLists.txt b/examples/network/fortuneclient/CMakeLists.txt index a9e0e00c7eb..6530cdcf00b 100644 --- a/examples/network/fortuneclient/CMakeLists.txt +++ b/examples/network/fortuneclient/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_executable(fortuneclient WIN32 MACOSX_BUNDLE +add_qt_gui_executable(fortuneclient WIN32 MACOSX_BUNDLE client.cpp client.h main.cpp ) diff --git a/examples/network/fortuneserver/CMakeLists.txt b/examples/network/fortuneserver/CMakeLists.txt index 03604f121ec..43ca6f7d2b0 100644 --- a/examples/network/fortuneserver/CMakeLists.txt +++ b/examples/network/fortuneserver/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_executable(fortuneserver WIN32 MACOSX_BUNDLE +add_qt_gui_executable(fortuneserver WIN32 MACOSX_BUNDLE main.cpp server.cpp server.h ) diff --git a/examples/network/googlesuggest/CMakeLists.txt b/examples/network/googlesuggest/CMakeLists.txt index d445bf646d5..b1556de464e 100644 --- a/examples/network/googlesuggest/CMakeLists.txt +++ b/examples/network/googlesuggest/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_executable(googlesuggest WIN32 MACOSX_BUNDLE +add_qt_gui_executable(googlesuggest WIN32 MACOSX_BUNDLE googlesuggest.cpp googlesuggest.h main.cpp searchbox.cpp searchbox.h diff --git a/examples/network/http/CMakeLists.txt b/examples/network/http/CMakeLists.txt index 931c834eae3..3da3b8c3ac7 100644 --- a/examples/network/http/CMakeLists.txt +++ b/examples/network/http/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_executable(http WIN32 MACOSX_BUNDLE +add_qt_gui_executable(http WIN32 MACOSX_BUNDLE authenticationdialog.ui httpwindow.cpp httpwindow.h main.cpp diff --git a/examples/network/loopback/CMakeLists.txt b/examples/network/loopback/CMakeLists.txt index 06410c7b5cd..e6f46b0933d 100644 --- a/examples/network/loopback/CMakeLists.txt +++ b/examples/network/loopback/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_executable(loopback WIN32 MACOSX_BUNDLE +add_qt_gui_executable(loopback WIN32 MACOSX_BUNDLE dialog.cpp dialog.h main.cpp ) diff --git a/examples/network/multicastreceiver/CMakeLists.txt b/examples/network/multicastreceiver/CMakeLists.txt index 71bcadc2536..eaabf8a5d52 100644 --- a/examples/network/multicastreceiver/CMakeLists.txt +++ b/examples/network/multicastreceiver/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_executable(multicastreceiver WIN32 MACOSX_BUNDLE +add_qt_gui_executable(multicastreceiver WIN32 MACOSX_BUNDLE main.cpp receiver.cpp receiver.h ) diff --git a/examples/network/multicastsender/CMakeLists.txt b/examples/network/multicastsender/CMakeLists.txt index bcb23706494..8504bc36472 100644 --- a/examples/network/multicastsender/CMakeLists.txt +++ b/examples/network/multicastsender/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_executable(multicastsender WIN32 MACOSX_BUNDLE +add_qt_gui_executable(multicastsender WIN32 MACOSX_BUNDLE main.cpp sender.cpp sender.h ) diff --git a/examples/network/multistreamclient/CMakeLists.txt b/examples/network/multistreamclient/CMakeLists.txt index 399333fd29a..c0091d10466 100644 --- a/examples/network/multistreamclient/CMakeLists.txt +++ b/examples/network/multistreamclient/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_executable(multistreamclient WIN32 MACOSX_BUNDLE +add_qt_gui_executable(multistreamclient WIN32 MACOSX_BUNDLE chatconsumer.cpp chatconsumer.h client.cpp client.h consumer.h diff --git a/examples/network/multistreamserver/CMakeLists.txt b/examples/network/multistreamserver/CMakeLists.txt index bf48042f58f..44c36e43221 100644 --- a/examples/network/multistreamserver/CMakeLists.txt +++ b/examples/network/multistreamserver/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_executable(multistreamserver WIN32 MACOSX_BUNDLE +add_qt_gui_executable(multistreamserver WIN32 MACOSX_BUNDLE chatprovider.cpp chatprovider.h main.cpp movieprovider.cpp movieprovider.h diff --git a/examples/network/network-chat/CMakeLists.txt b/examples/network/network-chat/CMakeLists.txt index a4fb9503708..be60e01f142 100644 --- a/examples/network/network-chat/CMakeLists.txt +++ b/examples/network/network-chat/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_executable(network-chat WIN32 MACOSX_BUNDLE +add_qt_gui_executable(network-chat WIN32 MACOSX_BUNDLE chatdialog.cpp chatdialog.h chatdialog.ui client.cpp client.h connection.cpp connection.h diff --git a/examples/network/securesocketclient/CMakeLists.txt b/examples/network/securesocketclient/CMakeLists.txt index d112af044a6..f00d138d805 100644 --- a/examples/network/securesocketclient/CMakeLists.txt +++ b/examples/network/securesocketclient/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_executable(securesocketclient WIN32 MACOSX_BUNDLE +add_qt_gui_executable(securesocketclient WIN32 MACOSX_BUNDLE certificateinfo.cpp certificateinfo.h certificateinfo.ui main.cpp securesocketclient.qrc diff --git a/examples/network/secureudpclient/CMakeLists.txt b/examples/network/secureudpclient/CMakeLists.txt index 531b1196a38..6af110c4122 100644 --- a/examples/network/secureudpclient/CMakeLists.txt +++ b/examples/network/secureudpclient/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) find_package(Qt5 COMPONENTS Network) -add_executable(secureudpclient WIN32 MACOSX_BUNDLE +add_qt_gui_executable(secureudpclient WIN32 MACOSX_BUNDLE addressdialog.cpp addressdialog.h addressdialog.ui association.cpp association.h main.cpp diff --git a/examples/network/secureudpserver/CMakeLists.txt b/examples/network/secureudpserver/CMakeLists.txt index e6e60711d0c..f30d8808009 100644 --- a/examples/network/secureudpserver/CMakeLists.txt +++ b/examples/network/secureudpserver/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) find_package(Qt5 COMPONENTS Network) -add_executable(secureudpserver WIN32 MACOSX_BUNDLE +add_qt_gui_executable(secureudpserver WIN32 MACOSX_BUNDLE main.cpp mainwindow.cpp mainwindow.h mainwindow.ui nicselector.cpp nicselector.h nicselector.ui diff --git a/examples/network/threadedfortuneserver/CMakeLists.txt b/examples/network/threadedfortuneserver/CMakeLists.txt index 43b95e60d5c..ce5c0e0d194 100644 --- a/examples/network/threadedfortuneserver/CMakeLists.txt +++ b/examples/network/threadedfortuneserver/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_executable(threadedfortuneserver WIN32 MACOSX_BUNDLE +add_qt_gui_executable(threadedfortuneserver WIN32 MACOSX_BUNDLE dialog.cpp dialog.h fortuneserver.cpp fortuneserver.h fortunethread.cpp fortunethread.h diff --git a/examples/network/torrent/.prev_CMakeLists.txt b/examples/network/torrent/.prev_CMakeLists.txt index 8391a0a9db3..3673b7e05a0 100644 --- a/examples/network/torrent/.prev_CMakeLists.txt +++ b/examples/network/torrent/.prev_CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_executable(torrent WIN32 MACOSX_BUNDLE +add_qt_gui_executable(torrent WIN32 MACOSX_BUNDLE addtorrentdialog.cpp addtorrentdialog.h bencodeparser.cpp bencodeparser.h connectionmanager.cpp connectionmanager.h diff --git a/examples/network/torrent/CMakeLists.txt b/examples/network/torrent/CMakeLists.txt index 2a49e3800bd..86bad72ab7e 100644 --- a/examples/network/torrent/CMakeLists.txt +++ b/examples/network/torrent/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Widgets) -add_executable(torrent WIN32 MACOSX_BUNDLE +add_qt_gui_executable(torrent WIN32 MACOSX_BUNDLE addtorrentdialog.cpp addtorrentdialog.h bencodeparser.cpp bencodeparser.h connectionmanager.cpp connectionmanager.h diff --git a/examples/qpa/qrasterwindow/CMakeLists.txt b/examples/qpa/qrasterwindow/CMakeLists.txt index c74ce2974b2..f718796eb94 100644 --- a/examples/qpa/qrasterwindow/CMakeLists.txt +++ b/examples/qpa/qrasterwindow/CMakeLists.txt @@ -13,7 +13,7 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -add_executable(qrasterwindow WIN32 MACOSX_BUNDLE +add_qt_gui_executable(qrasterwindow WIN32 MACOSX_BUNDLE main.cpp ) target_link_libraries(qrasterwindow PUBLIC Qt::Gui) # special case: add diff --git a/examples/qtconcurrent/imagescaling/CMakeLists.txt b/examples/qtconcurrent/imagescaling/CMakeLists.txt index a288397de7d..448bcf848e1 100644 --- a/examples/qtconcurrent/imagescaling/CMakeLists.txt +++ b/examples/qtconcurrent/imagescaling/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Concurrent) find_package(Qt5 COMPONENTS Widgets) -add_executable(imagescaling WIN32 MACOSX_BUNDLE +add_qt_gui_executable(imagescaling WIN32 MACOSX_BUNDLE imagescaling.cpp imagescaling.h main.cpp ) diff --git a/examples/qtestlib/tutorial1/CMakeLists.txt b/examples/qtestlib/tutorial1/CMakeLists.txt index b30293a3e3f..fb834211a7f 100644 --- a/examples/qtestlib/tutorial1/CMakeLists.txt +++ b/examples/qtestlib/tutorial1/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) find_package(Qt5 COMPONENTS Test) -add_executable(tutorial1 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(tutorial1 WIN32 MACOSX_BUNDLE testqstring.cpp ) target_link_libraries(tutorial1 PUBLIC diff --git a/examples/qtestlib/tutorial2/CMakeLists.txt b/examples/qtestlib/tutorial2/CMakeLists.txt index ed7cc3f2240..600cbb2ddd4 100644 --- a/examples/qtestlib/tutorial2/CMakeLists.txt +++ b/examples/qtestlib/tutorial2/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) find_package(Qt5 COMPONENTS Test) -add_executable(tutorial2 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(tutorial2 WIN32 MACOSX_BUNDLE testqstring.cpp ) target_link_libraries(tutorial2 PUBLIC diff --git a/examples/qtestlib/tutorial3/CMakeLists.txt b/examples/qtestlib/tutorial3/CMakeLists.txt index 975ac4dfd66..457495997fc 100644 --- a/examples/qtestlib/tutorial3/CMakeLists.txt +++ b/examples/qtestlib/tutorial3/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) find_package(Qt5 COMPONENTS Test) -add_executable(tutorial3 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(tutorial3 WIN32 MACOSX_BUNDLE testgui.cpp ) target_link_libraries(tutorial3 PUBLIC diff --git a/examples/qtestlib/tutorial4/CMakeLists.txt b/examples/qtestlib/tutorial4/CMakeLists.txt index 069afd031e7..6d2c0f2ce12 100644 --- a/examples/qtestlib/tutorial4/CMakeLists.txt +++ b/examples/qtestlib/tutorial4/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) find_package(Qt5 COMPONENTS Test) -add_executable(tutorial4 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(tutorial4 WIN32 MACOSX_BUNDLE testgui.cpp ) target_link_libraries(tutorial4 PUBLIC diff --git a/examples/qtestlib/tutorial5/CMakeLists.txt b/examples/qtestlib/tutorial5/CMakeLists.txt index 65dba6dcb53..b0e2995b2ae 100644 --- a/examples/qtestlib/tutorial5/CMakeLists.txt +++ b/examples/qtestlib/tutorial5/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) find_package(Qt5 COMPONENTS Test) -add_executable(tutorial5 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(tutorial5 WIN32 MACOSX_BUNDLE benchmarking.cpp ) target_link_libraries(tutorial5 PUBLIC diff --git a/examples/sql/books/CMakeLists.txt b/examples/sql/books/CMakeLists.txt index 294a764a9be..cfee3e237da 100644 --- a/examples/sql/books/CMakeLists.txt +++ b/examples/sql/books/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Sql) find_package(Qt5 COMPONENTS Widgets) -add_executable(books WIN32 MACOSX_BUNDLE +add_qt_gui_executable(books WIN32 MACOSX_BUNDLE bookdelegate.cpp bookdelegate.h books.qrc bookwindow.cpp bookwindow.h bookwindow.ui diff --git a/examples/sql/cachedtable/CMakeLists.txt b/examples/sql/cachedtable/CMakeLists.txt index 3ccea061ff7..16ef886b1c4 100644 --- a/examples/sql/cachedtable/CMakeLists.txt +++ b/examples/sql/cachedtable/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Sql) find_package(Qt5 COMPONENTS Widgets) -add_executable(cachedtable WIN32 MACOSX_BUNDLE +add_qt_gui_executable(cachedtable WIN32 MACOSX_BUNDLE ../connection.h main.cpp tableeditor.cpp tableeditor.h diff --git a/examples/sql/drilldown/CMakeLists.txt b/examples/sql/drilldown/CMakeLists.txt index b8fab77b0c4..ed411d1ca34 100644 --- a/examples/sql/drilldown/CMakeLists.txt +++ b/examples/sql/drilldown/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Sql) find_package(Qt5 COMPONENTS Widgets) -add_executable(drilldown WIN32 MACOSX_BUNDLE +add_qt_gui_executable(drilldown WIN32 MACOSX_BUNDLE ../connection.h drilldown.qrc imageitem.cpp imageitem.h diff --git a/examples/sql/masterdetail/CMakeLists.txt b/examples/sql/masterdetail/CMakeLists.txt index d1f4883da1d..832cbdea8b0 100644 --- a/examples/sql/masterdetail/CMakeLists.txt +++ b/examples/sql/masterdetail/CMakeLists.txt @@ -15,7 +15,7 @@ find_package(Qt5 COMPONENTS Sql) find_package(Qt5 COMPONENTS Widgets) find_package(Qt5 COMPONENTS Xml) -add_executable(masterdetail WIN32 MACOSX_BUNDLE +add_qt_gui_executable(masterdetail WIN32 MACOSX_BUNDLE database.h dialog.cpp dialog.h main.cpp diff --git a/examples/sql/querymodel/CMakeLists.txt b/examples/sql/querymodel/CMakeLists.txt index 7f617c7c33b..6dc59a4bb76 100644 --- a/examples/sql/querymodel/CMakeLists.txt +++ b/examples/sql/querymodel/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Sql) find_package(Qt5 COMPONENTS Widgets) -add_executable(querymodel WIN32 MACOSX_BUNDLE +add_qt_gui_executable(querymodel WIN32 MACOSX_BUNDLE ../connection.h customsqlmodel.cpp customsqlmodel.h editablesqlmodel.cpp editablesqlmodel.h diff --git a/examples/sql/relationaltablemodel/CMakeLists.txt b/examples/sql/relationaltablemodel/CMakeLists.txt index de4dba49ccf..0d35a9abdbc 100644 --- a/examples/sql/relationaltablemodel/CMakeLists.txt +++ b/examples/sql/relationaltablemodel/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Sql) find_package(Qt5 COMPONENTS Widgets) -add_executable(relationaltablemodel WIN32 MACOSX_BUNDLE +add_qt_gui_executable(relationaltablemodel WIN32 MACOSX_BUNDLE ../connection.h relationaltablemodel.cpp ) diff --git a/examples/sql/sqlbrowser/CMakeLists.txt b/examples/sql/sqlbrowser/CMakeLists.txt index dee4d4a58e8..f52de00ce66 100644 --- a/examples/sql/sqlbrowser/CMakeLists.txt +++ b/examples/sql/sqlbrowser/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Sql) find_package(Qt5 COMPONENTS Widgets) -add_executable(sqlbrowser WIN32 MACOSX_BUNDLE +add_qt_gui_executable(sqlbrowser WIN32 MACOSX_BUNDLE browser.cpp browser.h browserwidget.ui connectionwidget.cpp connectionwidget.h diff --git a/examples/sql/sqlwidgetmapper/CMakeLists.txt b/examples/sql/sqlwidgetmapper/CMakeLists.txt index 586592fb181..48e68209c5d 100644 --- a/examples/sql/sqlwidgetmapper/CMakeLists.txt +++ b/examples/sql/sqlwidgetmapper/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Sql) find_package(Qt5 COMPONENTS Widgets) -add_executable(sqlwidgetmapper WIN32 MACOSX_BUNDLE +add_qt_gui_executable(sqlwidgetmapper WIN32 MACOSX_BUNDLE main.cpp window.cpp window.h ) diff --git a/examples/sql/tablemodel/CMakeLists.txt b/examples/sql/tablemodel/CMakeLists.txt index 99729271662..fb7dbac9275 100644 --- a/examples/sql/tablemodel/CMakeLists.txt +++ b/examples/sql/tablemodel/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Sql) find_package(Qt5 COMPONENTS Widgets) -add_executable(tablemodel WIN32 MACOSX_BUNDLE +add_qt_gui_executable(tablemodel WIN32 MACOSX_BUNDLE ../connection.h tablemodel.cpp ) diff --git a/examples/widgets/animation/animatedtiles/CMakeLists.txt b/examples/widgets/animation/animatedtiles/CMakeLists.txt index dacde5535cc..e3fa88aebba 100644 --- a/examples/widgets/animation/animatedtiles/CMakeLists.txt +++ b/examples/widgets/animation/animatedtiles/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(animatedtiles WIN32 MACOSX_BUNDLE +add_qt_gui_executable(animatedtiles WIN32 MACOSX_BUNDLE animatedtiles.qrc main.cpp ) diff --git a/examples/widgets/animation/easing/CMakeLists.txt b/examples/widgets/animation/easing/CMakeLists.txt index 1500b11f3bf..441b27b0c49 100644 --- a/examples/widgets/animation/easing/CMakeLists.txt +++ b/examples/widgets/animation/easing/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(easing WIN32 MACOSX_BUNDLE +add_qt_gui_executable(easing WIN32 MACOSX_BUNDLE animation.h easing.qrc form.ui diff --git a/examples/widgets/animation/moveblocks/CMakeLists.txt b/examples/widgets/animation/moveblocks/CMakeLists.txt index cc2b70af44b..971bf2e7e53 100644 --- a/examples/widgets/animation/moveblocks/CMakeLists.txt +++ b/examples/widgets/animation/moveblocks/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(moveblocks WIN32 MACOSX_BUNDLE +add_qt_gui_executable(moveblocks WIN32 MACOSX_BUNDLE main.cpp ) target_link_libraries(moveblocks PUBLIC diff --git a/examples/widgets/animation/states/CMakeLists.txt b/examples/widgets/animation/states/CMakeLists.txt index a28995db997..bd353422d28 100644 --- a/examples/widgets/animation/states/CMakeLists.txt +++ b/examples/widgets/animation/states/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(states WIN32 MACOSX_BUNDLE +add_qt_gui_executable(states WIN32 MACOSX_BUNDLE main.cpp states.qrc ) diff --git a/examples/widgets/animation/stickman/CMakeLists.txt b/examples/widgets/animation/stickman/CMakeLists.txt index 5cb2e86c487..90bc09e5d74 100644 --- a/examples/widgets/animation/stickman/CMakeLists.txt +++ b/examples/widgets/animation/stickman/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(stickman WIN32 MACOSX_BUNDLE +add_qt_gui_executable(stickman WIN32 MACOSX_BUNDLE animation.cpp animation.h graphicsview.cpp graphicsview.h lifecycle.cpp lifecycle.h diff --git a/examples/widgets/animation/sub-attaq/CMakeLists.txt b/examples/widgets/animation/sub-attaq/CMakeLists.txt index 3260a5f75d1..883c1cd0c58 100644 --- a/examples/widgets/animation/sub-attaq/CMakeLists.txt +++ b/examples/widgets/animation/sub-attaq/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) find_package(Qt5 COMPONENTS OpenGL) # special case -add_executable(sub-attaq WIN32 MACOSX_BUNDLE +add_qt_gui_executable(sub-attaq WIN32 MACOSX_BUNDLE animationmanager.cpp animationmanager.h boat.cpp boat.h boat_p.h bomb.cpp bomb.h diff --git a/examples/widgets/desktop/screenshot/CMakeLists.txt b/examples/widgets/desktop/screenshot/CMakeLists.txt index e4533298d07..4c207f1bef5 100644 --- a/examples/widgets/desktop/screenshot/CMakeLists.txt +++ b/examples/widgets/desktop/screenshot/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(screenshot WIN32 MACOSX_BUNDLE +add_qt_gui_executable(screenshot WIN32 MACOSX_BUNDLE main.cpp screenshot.cpp screenshot.h ) diff --git a/examples/widgets/desktop/systray/CMakeLists.txt b/examples/widgets/desktop/systray/CMakeLists.txt index 2e89c2a8f9d..754ccad8e3c 100644 --- a/examples/widgets/desktop/systray/CMakeLists.txt +++ b/examples/widgets/desktop/systray/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(systray WIN32 MACOSX_BUNDLE +add_qt_gui_executable(systray WIN32 MACOSX_BUNDLE main.cpp systray.qrc window.cpp window.h diff --git a/examples/widgets/dialogs/classwizard/CMakeLists.txt b/examples/widgets/dialogs/classwizard/CMakeLists.txt index 1c9ecebcee8..5a57c5905ac 100644 --- a/examples/widgets/dialogs/classwizard/CMakeLists.txt +++ b/examples/widgets/dialogs/classwizard/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(classwizard WIN32 MACOSX_BUNDLE +add_qt_gui_executable(classwizard WIN32 MACOSX_BUNDLE classwizard.cpp classwizard.h classwizard.qrc main.cpp ) diff --git a/examples/widgets/dialogs/extension/CMakeLists.txt b/examples/widgets/dialogs/extension/CMakeLists.txt index 8037d670d93..fa35d52048b 100644 --- a/examples/widgets/dialogs/extension/CMakeLists.txt +++ b/examples/widgets/dialogs/extension/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(extension WIN32 MACOSX_BUNDLE +add_qt_gui_executable(extension WIN32 MACOSX_BUNDLE finddialog.cpp finddialog.h main.cpp ) diff --git a/examples/widgets/dialogs/findfiles/CMakeLists.txt b/examples/widgets/dialogs/findfiles/CMakeLists.txt index 11e971b7f21..12ce6ce05ee 100644 --- a/examples/widgets/dialogs/findfiles/CMakeLists.txt +++ b/examples/widgets/dialogs/findfiles/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(findfiles WIN32 MACOSX_BUNDLE +add_qt_gui_executable(findfiles WIN32 MACOSX_BUNDLE main.cpp window.cpp window.h ) diff --git a/examples/widgets/dialogs/licensewizard/CMakeLists.txt b/examples/widgets/dialogs/licensewizard/CMakeLists.txt index eef8e33ca15..a82800363e0 100644 --- a/examples/widgets/dialogs/licensewizard/CMakeLists.txt +++ b/examples/widgets/dialogs/licensewizard/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) find_package(Qt5 COMPONENTS PrintSupport) -add_executable(licensewizard WIN32 MACOSX_BUNDLE +add_qt_gui_executable(licensewizard WIN32 MACOSX_BUNDLE licensewizard.cpp licensewizard.h licensewizard.qrc main.cpp ) diff --git a/examples/widgets/dialogs/standarddialogs/CMakeLists.txt b/examples/widgets/dialogs/standarddialogs/CMakeLists.txt index 2aa96fba067..91c74b71e11 100644 --- a/examples/widgets/dialogs/standarddialogs/CMakeLists.txt +++ b/examples/widgets/dialogs/standarddialogs/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(standarddialogs WIN32 MACOSX_BUNDLE +add_qt_gui_executable(standarddialogs WIN32 MACOSX_BUNDLE dialog.cpp dialog.h main.cpp ) diff --git a/examples/widgets/dialogs/tabdialog/CMakeLists.txt b/examples/widgets/dialogs/tabdialog/CMakeLists.txt index da05a322f31..ec88fd66d02 100644 --- a/examples/widgets/dialogs/tabdialog/CMakeLists.txt +++ b/examples/widgets/dialogs/tabdialog/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(tabdialog WIN32 MACOSX_BUNDLE +add_qt_gui_executable(tabdialog WIN32 MACOSX_BUNDLE main.cpp tabdialog.cpp tabdialog.h ) diff --git a/examples/widgets/dialogs/trivialwizard/CMakeLists.txt b/examples/widgets/dialogs/trivialwizard/CMakeLists.txt index 307945b2c2c..394816619d3 100644 --- a/examples/widgets/dialogs/trivialwizard/CMakeLists.txt +++ b/examples/widgets/dialogs/trivialwizard/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(trivialwizard WIN32 MACOSX_BUNDLE +add_qt_gui_executable(trivialwizard WIN32 MACOSX_BUNDLE trivialwizard.cpp ) target_link_libraries(trivialwizard PUBLIC diff --git a/examples/widgets/draganddrop/draggableicons/CMakeLists.txt b/examples/widgets/draganddrop/draggableicons/CMakeLists.txt index ced583e1dbb..d7ec690a986 100644 --- a/examples/widgets/draganddrop/draggableicons/CMakeLists.txt +++ b/examples/widgets/draganddrop/draggableicons/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(draggableicons WIN32 MACOSX_BUNDLE +add_qt_gui_executable(draggableicons WIN32 MACOSX_BUNDLE draggableicons.qrc dragwidget.cpp dragwidget.h main.cpp diff --git a/examples/widgets/draganddrop/draggabletext/CMakeLists.txt b/examples/widgets/draganddrop/draggabletext/CMakeLists.txt index aa6656ed0bc..c145771015a 100644 --- a/examples/widgets/draganddrop/draggabletext/CMakeLists.txt +++ b/examples/widgets/draganddrop/draggabletext/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(draggabletext WIN32 MACOSX_BUNDLE +add_qt_gui_executable(draggabletext WIN32 MACOSX_BUNDLE draggabletext.qrc dragwidget.cpp dragwidget.h main.cpp diff --git a/examples/widgets/draganddrop/dropsite/CMakeLists.txt b/examples/widgets/draganddrop/dropsite/CMakeLists.txt index abb850c0b63..863a757f39c 100644 --- a/examples/widgets/draganddrop/dropsite/CMakeLists.txt +++ b/examples/widgets/draganddrop/dropsite/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(dropsite WIN32 MACOSX_BUNDLE +add_qt_gui_executable(dropsite WIN32 MACOSX_BUNDLE droparea.cpp droparea.h dropsitewindow.cpp dropsitewindow.h main.cpp diff --git a/examples/widgets/draganddrop/fridgemagnets/CMakeLists.txt b/examples/widgets/draganddrop/fridgemagnets/CMakeLists.txt index e0ab3d36c51..d7acb41b219 100644 --- a/examples/widgets/draganddrop/fridgemagnets/CMakeLists.txt +++ b/examples/widgets/draganddrop/fridgemagnets/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(fridgemagnets WIN32 MACOSX_BUNDLE +add_qt_gui_executable(fridgemagnets WIN32 MACOSX_BUNDLE draglabel.cpp draglabel.h dragwidget.cpp dragwidget.h fridgemagnets.qrc diff --git a/examples/widgets/draganddrop/puzzle/CMakeLists.txt b/examples/widgets/draganddrop/puzzle/CMakeLists.txt index b95d7b2cf44..44191011177 100644 --- a/examples/widgets/draganddrop/puzzle/CMakeLists.txt +++ b/examples/widgets/draganddrop/puzzle/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(draganddrop_puzzle WIN32 MACOSX_BUNDLE # special case: renamed puzzle +add_qt_gui_executable(draganddrop_puzzle WIN32 MACOSX_BUNDLE # special case: renamed puzzle main.cpp mainwindow.cpp mainwindow.h pieceslist.cpp pieceslist.h diff --git a/examples/widgets/effects/blurpicker/CMakeLists.txt b/examples/widgets/effects/blurpicker/CMakeLists.txt index c99beb310f0..f5b7047b8aa 100644 --- a/examples/widgets/effects/blurpicker/CMakeLists.txt +++ b/examples/widgets/effects/blurpicker/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(blurpicker WIN32 MACOSX_BUNDLE +add_qt_gui_executable(blurpicker WIN32 MACOSX_BUNDLE blureffect.cpp blureffect.h blurpicker.cpp blurpicker.h blurpicker.qrc main.cpp diff --git a/examples/widgets/effects/fademessage/CMakeLists.txt b/examples/widgets/effects/fademessage/CMakeLists.txt index 689b0593eaf..e53fc405f76 100644 --- a/examples/widgets/effects/fademessage/CMakeLists.txt +++ b/examples/widgets/effects/fademessage/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(fademessage WIN32 MACOSX_BUNDLE +add_qt_gui_executable(fademessage WIN32 MACOSX_BUNDLE fademessage.cpp fademessage.h fademessage.qrc main.cpp ) diff --git a/examples/widgets/gestures/imagegestures/CMakeLists.txt b/examples/widgets/gestures/imagegestures/CMakeLists.txt index 1efaa427742..75f2b981b79 100644 --- a/examples/widgets/gestures/imagegestures/CMakeLists.txt +++ b/examples/widgets/gestures/imagegestures/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(imagegestures WIN32 MACOSX_BUNDLE +add_qt_gui_executable(imagegestures WIN32 MACOSX_BUNDLE imagewidget.cpp imagewidget.h main.cpp mainwidget.cpp mainwidget.h diff --git a/examples/widgets/graphicsview/anchorlayout/CMakeLists.txt b/examples/widgets/graphicsview/anchorlayout/CMakeLists.txt index 1488f394c6a..9676dbbcbad 100644 --- a/examples/widgets/graphicsview/anchorlayout/CMakeLists.txt +++ b/examples/widgets/graphicsview/anchorlayout/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(anchorlayout WIN32 MACOSX_BUNDLE +add_qt_gui_executable(anchorlayout WIN32 MACOSX_BUNDLE main.cpp ) target_link_libraries(anchorlayout PUBLIC diff --git a/examples/widgets/graphicsview/basicgraphicslayouts/CMakeLists.txt b/examples/widgets/graphicsview/basicgraphicslayouts/CMakeLists.txt index 0ce632e6b6a..982fd541c60 100644 --- a/examples/widgets/graphicsview/basicgraphicslayouts/CMakeLists.txt +++ b/examples/widgets/graphicsview/basicgraphicslayouts/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(basicgraphicslayouts WIN32 MACOSX_BUNDLE +add_qt_gui_executable(basicgraphicslayouts WIN32 MACOSX_BUNDLE basicgraphicslayouts.qrc layoutitem.cpp layoutitem.h main.cpp diff --git a/examples/widgets/graphicsview/boxes/CMakeLists.txt b/examples/widgets/graphicsview/boxes/CMakeLists.txt index 4e1d105a3af..b5441bcfdf5 100644 --- a/examples/widgets/graphicsview/boxes/CMakeLists.txt +++ b/examples/widgets/graphicsview/boxes/CMakeLists.txt @@ -15,7 +15,7 @@ find_package(Qt5 COMPONENTS OpenGL) find_package(Qt5 COMPONENTS Widgets) -add_executable(boxes WIN32 MACOSX_BUNDLE +add_qt_gui_executable(boxes WIN32 MACOSX_BUNDLE 3rdparty/fbm.c 3rdparty/fbm.h boxes.qrc glbuffers.cpp glbuffers.h diff --git a/examples/widgets/graphicsview/chip/CMakeLists.txt b/examples/widgets/graphicsview/chip/CMakeLists.txt index 81f290be995..141645a22c6 100644 --- a/examples/widgets/graphicsview/chip/CMakeLists.txt +++ b/examples/widgets/graphicsview/chip/CMakeLists.txt @@ -15,7 +15,7 @@ find_package(Qt5 COMPONENTS Widgets) find_package(Qt5 COMPONENTS OpenGL) # special case find_package(Qt5 COMPONENTS PrintSupport) # special case -add_executable(chip WIN32 MACOSX_BUNDLE +add_qt_gui_executable(chip WIN32 MACOSX_BUNDLE chip.cpp chip.h images.qrc main.cpp diff --git a/examples/widgets/graphicsview/collidingmice/CMakeLists.txt b/examples/widgets/graphicsview/collidingmice/CMakeLists.txt index 36b1fb85c17..90018588170 100644 --- a/examples/widgets/graphicsview/collidingmice/CMakeLists.txt +++ b/examples/widgets/graphicsview/collidingmice/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(collidingmice WIN32 MACOSX_BUNDLE +add_qt_gui_executable(collidingmice WIN32 MACOSX_BUNDLE main.cpp mice.qrc mouse.cpp mouse.h diff --git a/examples/widgets/graphicsview/diagramscene/CMakeLists.txt b/examples/widgets/graphicsview/diagramscene/CMakeLists.txt index 76f60aabaad..bfdd3b8f5b0 100644 --- a/examples/widgets/graphicsview/diagramscene/CMakeLists.txt +++ b/examples/widgets/graphicsview/diagramscene/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(diagramscene WIN32 MACOSX_BUNDLE +add_qt_gui_executable(diagramscene WIN32 MACOSX_BUNDLE arrow.cpp arrow.h diagramitem.cpp diagramitem.h diagramscene.cpp diagramscene.h diagramscene.qrc diff --git a/examples/widgets/graphicsview/dragdroprobot/CMakeLists.txt b/examples/widgets/graphicsview/dragdroprobot/CMakeLists.txt index 2adcff3ae5b..d85dcd1ff94 100644 --- a/examples/widgets/graphicsview/dragdroprobot/CMakeLists.txt +++ b/examples/widgets/graphicsview/dragdroprobot/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(dragdroprobot WIN32 MACOSX_BUNDLE +add_qt_gui_executable(dragdroprobot WIN32 MACOSX_BUNDLE coloritem.cpp coloritem.h main.cpp robot.cpp robot.h robot.qrc diff --git a/examples/widgets/graphicsview/elasticnodes/CMakeLists.txt b/examples/widgets/graphicsview/elasticnodes/CMakeLists.txt index 42fd71fa5f9..b1e04b2a20b 100644 --- a/examples/widgets/graphicsview/elasticnodes/CMakeLists.txt +++ b/examples/widgets/graphicsview/elasticnodes/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(elasticnodes WIN32 MACOSX_BUNDLE +add_qt_gui_executable(elasticnodes WIN32 MACOSX_BUNDLE edge.cpp edge.h graphwidget.cpp graphwidget.h main.cpp diff --git a/examples/widgets/graphicsview/embeddeddialogs/CMakeLists.txt b/examples/widgets/graphicsview/embeddeddialogs/CMakeLists.txt index 2652b985dfa..fc9f6086cef 100644 --- a/examples/widgets/graphicsview/embeddeddialogs/CMakeLists.txt +++ b/examples/widgets/graphicsview/embeddeddialogs/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(embeddeddialogs WIN32 MACOSX_BUNDLE +add_qt_gui_executable(embeddeddialogs WIN32 MACOSX_BUNDLE customproxy.cpp customproxy.h embeddeddialog.cpp embeddeddialog.h embeddeddialog.ui embeddeddialogs.qrc diff --git a/examples/widgets/graphicsview/flowlayout/CMakeLists.txt b/examples/widgets/graphicsview/flowlayout/CMakeLists.txt index 96b82b79557..ef5a4d55642 100644 --- a/examples/widgets/graphicsview/flowlayout/CMakeLists.txt +++ b/examples/widgets/graphicsview/flowlayout/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(graphicsview_flowlayout WIN32 MACOSX_BUNDLE # special case: renamed flowlayout +add_qt_gui_executable(graphicsview_flowlayout WIN32 MACOSX_BUNDLE # special case: renamed flowlayout flowlayout.cpp flowlayout.h main.cpp window.cpp window.h diff --git a/examples/widgets/graphicsview/simpleanchorlayout/CMakeLists.txt b/examples/widgets/graphicsview/simpleanchorlayout/CMakeLists.txt index afb35675d80..bc1564cb8c9 100644 --- a/examples/widgets/graphicsview/simpleanchorlayout/CMakeLists.txt +++ b/examples/widgets/graphicsview/simpleanchorlayout/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(simpleanchorlayout WIN32 MACOSX_BUNDLE +add_qt_gui_executable(simpleanchorlayout WIN32 MACOSX_BUNDLE main.cpp ) target_link_libraries(simpleanchorlayout PUBLIC diff --git a/examples/widgets/graphicsview/weatheranchorlayout/CMakeLists.txt b/examples/widgets/graphicsview/weatheranchorlayout/CMakeLists.txt index 750352e3251..22e92cc68b1 100644 --- a/examples/widgets/graphicsview/weatheranchorlayout/CMakeLists.txt +++ b/examples/widgets/graphicsview/weatheranchorlayout/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(weatheranchorlayout WIN32 MACOSX_BUNDLE +add_qt_gui_executable(weatheranchorlayout WIN32 MACOSX_BUNDLE main.cpp weatheranchorlayout.qrc ) diff --git a/examples/widgets/itemviews/addressbook/CMakeLists.txt b/examples/widgets/itemviews/addressbook/CMakeLists.txt index 026c2406a4b..2831e860a55 100644 --- a/examples/widgets/itemviews/addressbook/CMakeLists.txt +++ b/examples/widgets/itemviews/addressbook/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(addressbook WIN32 MACOSX_BUNDLE +add_qt_gui_executable(addressbook WIN32 MACOSX_BUNDLE adddialog.cpp adddialog.h addresswidget.cpp addresswidget.h main.cpp diff --git a/examples/widgets/itemviews/basicsortfiltermodel/CMakeLists.txt b/examples/widgets/itemviews/basicsortfiltermodel/CMakeLists.txt index 2efba58b105..8c4d84431e1 100644 --- a/examples/widgets/itemviews/basicsortfiltermodel/CMakeLists.txt +++ b/examples/widgets/itemviews/basicsortfiltermodel/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(basicsortfiltermodel WIN32 MACOSX_BUNDLE +add_qt_gui_executable(basicsortfiltermodel WIN32 MACOSX_BUNDLE main.cpp window.cpp window.h ) diff --git a/examples/widgets/itemviews/chart/CMakeLists.txt b/examples/widgets/itemviews/chart/CMakeLists.txt index 79c489b03e1..7aceadab54b 100644 --- a/examples/widgets/itemviews/chart/CMakeLists.txt +++ b/examples/widgets/itemviews/chart/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(chart WIN32 MACOSX_BUNDLE +add_qt_gui_executable(chart WIN32 MACOSX_BUNDLE chart.qrc main.cpp mainwindow.cpp mainwindow.h diff --git a/examples/widgets/itemviews/coloreditorfactory/CMakeLists.txt b/examples/widgets/itemviews/coloreditorfactory/CMakeLists.txt index c33cc611182..e3cea3e2351 100644 --- a/examples/widgets/itemviews/coloreditorfactory/CMakeLists.txt +++ b/examples/widgets/itemviews/coloreditorfactory/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(coloreditorfactory WIN32 MACOSX_BUNDLE +add_qt_gui_executable(coloreditorfactory WIN32 MACOSX_BUNDLE colorlisteditor.cpp colorlisteditor.h main.cpp window.cpp window.h diff --git a/examples/widgets/itemviews/combowidgetmapper/CMakeLists.txt b/examples/widgets/itemviews/combowidgetmapper/CMakeLists.txt index 7cce164bc6d..175f78e7732 100644 --- a/examples/widgets/itemviews/combowidgetmapper/CMakeLists.txt +++ b/examples/widgets/itemviews/combowidgetmapper/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(combowidgetmapper WIN32 MACOSX_BUNDLE +add_qt_gui_executable(combowidgetmapper WIN32 MACOSX_BUNDLE main.cpp window.cpp window.h ) diff --git a/examples/widgets/itemviews/customsortfiltermodel/CMakeLists.txt b/examples/widgets/itemviews/customsortfiltermodel/CMakeLists.txt index 0aa34c46d88..2c3627657ae 100644 --- a/examples/widgets/itemviews/customsortfiltermodel/CMakeLists.txt +++ b/examples/widgets/itemviews/customsortfiltermodel/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(customsortfiltermodel WIN32 MACOSX_BUNDLE +add_qt_gui_executable(customsortfiltermodel WIN32 MACOSX_BUNDLE customsortfiltermodel.qrc filterwidget.cpp filterwidget.h main.cpp diff --git a/examples/widgets/itemviews/dirview/CMakeLists.txt b/examples/widgets/itemviews/dirview/CMakeLists.txt index 3e6e7c9ac7b..105d420f1af 100644 --- a/examples/widgets/itemviews/dirview/CMakeLists.txt +++ b/examples/widgets/itemviews/dirview/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(dirview WIN32 MACOSX_BUNDLE +add_qt_gui_executable(dirview WIN32 MACOSX_BUNDLE main.cpp ) target_link_libraries(dirview PUBLIC diff --git a/examples/widgets/itemviews/editabletreemodel/CMakeLists.txt b/examples/widgets/itemviews/editabletreemodel/CMakeLists.txt index c86c0d7272d..f3e574c8110 100644 --- a/examples/widgets/itemviews/editabletreemodel/CMakeLists.txt +++ b/examples/widgets/itemviews/editabletreemodel/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(editabletreemodel WIN32 MACOSX_BUNDLE +add_qt_gui_executable(editabletreemodel WIN32 MACOSX_BUNDLE editabletreemodel.qrc main.cpp mainwindow.cpp mainwindow.h mainwindow.ui diff --git a/examples/widgets/itemviews/fetchmore/CMakeLists.txt b/examples/widgets/itemviews/fetchmore/CMakeLists.txt index 5013d5bab2c..be2771970a2 100644 --- a/examples/widgets/itemviews/fetchmore/CMakeLists.txt +++ b/examples/widgets/itemviews/fetchmore/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(fetchmore WIN32 MACOSX_BUNDLE +add_qt_gui_executable(fetchmore WIN32 MACOSX_BUNDLE filelistmodel.cpp filelistmodel.h main.cpp window.cpp window.h diff --git a/examples/widgets/itemviews/flattreeview/CMakeLists.txt b/examples/widgets/itemviews/flattreeview/CMakeLists.txt index afcb66a6b29..b026b2442f3 100644 --- a/examples/widgets/itemviews/flattreeview/CMakeLists.txt +++ b/examples/widgets/itemviews/flattreeview/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(flattreeview WIN32 MACOSX_BUNDLE +add_qt_gui_executable(flattreeview WIN32 MACOSX_BUNDLE main.cpp ) target_link_libraries(flattreeview PUBLIC diff --git a/examples/widgets/itemviews/frozencolumn/CMakeLists.txt b/examples/widgets/itemviews/frozencolumn/CMakeLists.txt index a17ffef5fcc..fee5570bd60 100644 --- a/examples/widgets/itemviews/frozencolumn/CMakeLists.txt +++ b/examples/widgets/itemviews/frozencolumn/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(frozencolumn WIN32 MACOSX_BUNDLE +add_qt_gui_executable(frozencolumn WIN32 MACOSX_BUNDLE freezetablewidget.cpp freezetablewidget.h grades.qrc main.cpp diff --git a/examples/widgets/itemviews/interview/CMakeLists.txt b/examples/widgets/itemviews/interview/CMakeLists.txt index f14bded157b..76a145c7d8b 100644 --- a/examples/widgets/itemviews/interview/CMakeLists.txt +++ b/examples/widgets/itemviews/interview/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(interview WIN32 MACOSX_BUNDLE +add_qt_gui_executable(interview WIN32 MACOSX_BUNDLE interview.qrc main.cpp model.cpp model.h diff --git a/examples/widgets/itemviews/pixelator/CMakeLists.txt b/examples/widgets/itemviews/pixelator/CMakeLists.txt index e9a04a0807b..e3e3388ba93 100644 --- a/examples/widgets/itemviews/pixelator/CMakeLists.txt +++ b/examples/widgets/itemviews/pixelator/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) find_package(Qt5 COMPONENTS PrintSupport) # special case -add_executable(pixelator WIN32 MACOSX_BUNDLE +add_qt_gui_executable(pixelator WIN32 MACOSX_BUNDLE imagemodel.cpp imagemodel.h images.qrc main.cpp diff --git a/examples/widgets/itemviews/puzzle/CMakeLists.txt b/examples/widgets/itemviews/puzzle/CMakeLists.txt index cffbdbb1b01..77abd09eaf5 100644 --- a/examples/widgets/itemviews/puzzle/CMakeLists.txt +++ b/examples/widgets/itemviews/puzzle/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(itemviews_puzzle WIN32 MACOSX_BUNDLE # special case: renamed puzzle +add_qt_gui_executable(itemviews_puzzle WIN32 MACOSX_BUNDLE # special case: renamed puzzle main.cpp mainwindow.cpp mainwindow.h piecesmodel.cpp piecesmodel.h diff --git a/examples/widgets/itemviews/simpledommodel/CMakeLists.txt b/examples/widgets/itemviews/simpledommodel/CMakeLists.txt index 4a1812d96d5..3573eca461e 100644 --- a/examples/widgets/itemviews/simpledommodel/CMakeLists.txt +++ b/examples/widgets/itemviews/simpledommodel/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Xml) find_package(Qt5 COMPONENTS Widgets) -add_executable(simpledommodel WIN32 MACOSX_BUNDLE +add_qt_gui_executable(simpledommodel WIN32 MACOSX_BUNDLE domitem.cpp domitem.h dommodel.cpp dommodel.h main.cpp diff --git a/examples/widgets/itemviews/simpletreemodel/CMakeLists.txt b/examples/widgets/itemviews/simpletreemodel/CMakeLists.txt index 3fb889229d0..34c59d55ae9 100644 --- a/examples/widgets/itemviews/simpletreemodel/CMakeLists.txt +++ b/examples/widgets/itemviews/simpletreemodel/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(simpletreemodel WIN32 MACOSX_BUNDLE +add_qt_gui_executable(simpletreemodel WIN32 MACOSX_BUNDLE main.cpp simpletreemodel.qrc treeitem.cpp treeitem.h diff --git a/examples/widgets/itemviews/simplewidgetmapper/CMakeLists.txt b/examples/widgets/itemviews/simplewidgetmapper/CMakeLists.txt index d25d4915443..dedf063b5f3 100644 --- a/examples/widgets/itemviews/simplewidgetmapper/CMakeLists.txt +++ b/examples/widgets/itemviews/simplewidgetmapper/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(simplewidgetmapper WIN32 MACOSX_BUNDLE +add_qt_gui_executable(simplewidgetmapper WIN32 MACOSX_BUNDLE main.cpp window.cpp window.h ) diff --git a/examples/widgets/itemviews/spinboxdelegate/CMakeLists.txt b/examples/widgets/itemviews/spinboxdelegate/CMakeLists.txt index 809c1cd0d0e..ed2ebc8ab30 100644 --- a/examples/widgets/itemviews/spinboxdelegate/CMakeLists.txt +++ b/examples/widgets/itemviews/spinboxdelegate/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(spinboxdelegate WIN32 MACOSX_BUNDLE +add_qt_gui_executable(spinboxdelegate WIN32 MACOSX_BUNDLE delegate.cpp delegate.h main.cpp ) diff --git a/examples/widgets/itemviews/spreadsheet/CMakeLists.txt b/examples/widgets/itemviews/spreadsheet/CMakeLists.txt index 811caec6a69..7e3676e780b 100644 --- a/examples/widgets/itemviews/spreadsheet/CMakeLists.txt +++ b/examples/widgets/itemviews/spreadsheet/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) find_package(Qt5 COMPONENTS PrintSupport) # special case -add_executable(spreadsheet WIN32 MACOSX_BUNDLE +add_qt_gui_executable(spreadsheet WIN32 MACOSX_BUNDLE main.cpp printview.cpp printview.h spreadsheet.cpp spreadsheet.h spreadsheet.qrc diff --git a/examples/widgets/itemviews/stardelegate/CMakeLists.txt b/examples/widgets/itemviews/stardelegate/CMakeLists.txt index 8cfb9911438..0d3bc684f8e 100644 --- a/examples/widgets/itemviews/stardelegate/CMakeLists.txt +++ b/examples/widgets/itemviews/stardelegate/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(stardelegate WIN32 MACOSX_BUNDLE +add_qt_gui_executable(stardelegate WIN32 MACOSX_BUNDLE main.cpp stardelegate.cpp stardelegate.h stareditor.cpp stareditor.h diff --git a/examples/widgets/itemviews/storageview/CMakeLists.txt b/examples/widgets/itemviews/storageview/CMakeLists.txt index d25d839347c..b254a217bcf 100644 --- a/examples/widgets/itemviews/storageview/CMakeLists.txt +++ b/examples/widgets/itemviews/storageview/CMakeLists.txt @@ -15,7 +15,7 @@ find_package(Qt5 COMPONENTS Core) find_package(Qt5 COMPONENTS Gui) find_package(Qt5 COMPONENTS Widgets) -add_executable(storageview WIN32 MACOSX_BUNDLE +add_qt_gui_executable(storageview WIN32 MACOSX_BUNDLE main.cpp storagemodel.cpp storagemodel.h ) diff --git a/examples/widgets/layouts/basiclayouts/CMakeLists.txt b/examples/widgets/layouts/basiclayouts/CMakeLists.txt index 83c4833b9d7..927cbd7520e 100644 --- a/examples/widgets/layouts/basiclayouts/CMakeLists.txt +++ b/examples/widgets/layouts/basiclayouts/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(basiclayouts WIN32 MACOSX_BUNDLE +add_qt_gui_executable(basiclayouts WIN32 MACOSX_BUNDLE dialog.cpp dialog.h main.cpp ) diff --git a/examples/widgets/layouts/borderlayout/CMakeLists.txt b/examples/widgets/layouts/borderlayout/CMakeLists.txt index cfe34ad68f1..74e867f6f18 100644 --- a/examples/widgets/layouts/borderlayout/CMakeLists.txt +++ b/examples/widgets/layouts/borderlayout/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(borderlayout WIN32 MACOSX_BUNDLE +add_qt_gui_executable(borderlayout WIN32 MACOSX_BUNDLE borderlayout.cpp borderlayout.h main.cpp window.cpp window.h diff --git a/examples/widgets/layouts/dynamiclayouts/CMakeLists.txt b/examples/widgets/layouts/dynamiclayouts/CMakeLists.txt index 1989672b9c9..fad7509823d 100644 --- a/examples/widgets/layouts/dynamiclayouts/CMakeLists.txt +++ b/examples/widgets/layouts/dynamiclayouts/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(dynamiclayouts WIN32 MACOSX_BUNDLE +add_qt_gui_executable(dynamiclayouts WIN32 MACOSX_BUNDLE dialog.cpp dialog.h main.cpp ) diff --git a/examples/widgets/layouts/flowlayout/CMakeLists.txt b/examples/widgets/layouts/flowlayout/CMakeLists.txt index 6a7ad689cab..b8257d9b4c5 100644 --- a/examples/widgets/layouts/flowlayout/CMakeLists.txt +++ b/examples/widgets/layouts/flowlayout/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(flowlayout WIN32 MACOSX_BUNDLE +add_qt_gui_executable(flowlayout WIN32 MACOSX_BUNDLE flowlayout.cpp flowlayout.h main.cpp window.cpp window.h diff --git a/examples/widgets/mac/qmaccocoaviewcontainer/CMakeLists.txt b/examples/widgets/mac/qmaccocoaviewcontainer/CMakeLists.txt index d442ccacd09..7a29a4cbc5b 100644 --- a/examples/widgets/mac/qmaccocoaviewcontainer/CMakeLists.txt +++ b/examples/widgets/mac/qmaccocoaviewcontainer/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(qmaccocoaviewcontainer WIN32 MACOSX_BUNDLE +add_qt_gui_executable(qmaccocoaviewcontainer WIN32 MACOSX_BUNDLE main.mm ) target_link_libraries(qmaccocoaviewcontainer PUBLIC diff --git a/examples/widgets/mac/qmacnativewidget/CMakeLists.txt b/examples/widgets/mac/qmacnativewidget/CMakeLists.txt index 267b49361f6..b17b8454b3a 100644 --- a/examples/widgets/mac/qmacnativewidget/CMakeLists.txt +++ b/examples/widgets/mac/qmacnativewidget/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(qmacnativewidget WIN32 MACOSX_BUNDLE +add_qt_gui_executable(qmacnativewidget WIN32 MACOSX_BUNDLE main.mm ) target_link_libraries(qmacnativewidget PUBLIC diff --git a/examples/widgets/mainwindows/application/CMakeLists.txt b/examples/widgets/mainwindows/application/CMakeLists.txt index 67ac4637ffa..090cac61c70 100644 --- a/examples/widgets/mainwindows/application/CMakeLists.txt +++ b/examples/widgets/mainwindows/application/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(application WIN32 MACOSX_BUNDLE +add_qt_gui_executable(application WIN32 MACOSX_BUNDLE application.qrc main.cpp mainwindow.cpp mainwindow.h diff --git a/examples/widgets/mainwindows/dockwidgets/CMakeLists.txt b/examples/widgets/mainwindows/dockwidgets/CMakeLists.txt index ceacc184dab..b3fe472db40 100644 --- a/examples/widgets/mainwindows/dockwidgets/CMakeLists.txt +++ b/examples/widgets/mainwindows/dockwidgets/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) find_package(Qt5 COMPONENTS PrintSupport) # special case -add_executable(dockwidgets WIN32 MACOSX_BUNDLE +add_qt_gui_executable(dockwidgets WIN32 MACOSX_BUNDLE dockwidgets.qrc main.cpp mainwindow.cpp mainwindow.h diff --git a/examples/widgets/mainwindows/mainwindow/CMakeLists.txt b/examples/widgets/mainwindows/mainwindow/CMakeLists.txt index 5af2a7ffe94..15824de79c6 100644 --- a/examples/widgets/mainwindows/mainwindow/CMakeLists.txt +++ b/examples/widgets/mainwindows/mainwindow/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(mainwindow WIN32 MACOSX_BUNDLE +add_qt_gui_executable(mainwindow WIN32 MACOSX_BUNDLE colorswatch.cpp colorswatch.h main.cpp mainwindow.cpp mainwindow.h mainwindow.qrc diff --git a/examples/widgets/mainwindows/mdi/CMakeLists.txt b/examples/widgets/mainwindows/mdi/CMakeLists.txt index 481e2477c13..fda2522b90e 100644 --- a/examples/widgets/mainwindows/mdi/CMakeLists.txt +++ b/examples/widgets/mainwindows/mdi/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(mdi WIN32 MACOSX_BUNDLE +add_qt_gui_executable(mdi WIN32 MACOSX_BUNDLE main.cpp mainwindow.cpp mainwindow.h mdi.qrc diff --git a/examples/widgets/mainwindows/menus/CMakeLists.txt b/examples/widgets/mainwindows/menus/CMakeLists.txt index a10ef9090e6..1e4d21248e5 100644 --- a/examples/widgets/mainwindows/menus/CMakeLists.txt +++ b/examples/widgets/mainwindows/menus/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(menus WIN32 MACOSX_BUNDLE +add_qt_gui_executable(menus WIN32 MACOSX_BUNDLE main.cpp mainwindow.cpp mainwindow.h ) diff --git a/examples/widgets/mainwindows/sdi/CMakeLists.txt b/examples/widgets/mainwindows/sdi/CMakeLists.txt index 81cb80f7a38..89c929fc5e5 100644 --- a/examples/widgets/mainwindows/sdi/CMakeLists.txt +++ b/examples/widgets/mainwindows/sdi/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(sdi WIN32 MACOSX_BUNDLE +add_qt_gui_executable(sdi WIN32 MACOSX_BUNDLE main.cpp mainwindow.cpp mainwindow.h sdi.qrc diff --git a/examples/widgets/painting/affine/CMakeLists.txt b/examples/widgets/painting/affine/CMakeLists.txt index a3dc7861fa3..4c8d408e9c5 100644 --- a/examples/widgets/painting/affine/CMakeLists.txt +++ b/examples/widgets/painting/affine/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(affine WIN32 MACOSX_BUNDLE +add_qt_gui_executable(affine WIN32 MACOSX_BUNDLE # special case: remove files from ../shared affine.qrc main.cpp diff --git a/examples/widgets/painting/basicdrawing/CMakeLists.txt b/examples/widgets/painting/basicdrawing/CMakeLists.txt index d0a0ac749d8..112334797ff 100644 --- a/examples/widgets/painting/basicdrawing/CMakeLists.txt +++ b/examples/widgets/painting/basicdrawing/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(basicdrawing WIN32 MACOSX_BUNDLE +add_qt_gui_executable(basicdrawing WIN32 MACOSX_BUNDLE basicdrawing.qrc main.cpp renderarea.cpp renderarea.h diff --git a/examples/widgets/painting/composition/CMakeLists.txt b/examples/widgets/painting/composition/CMakeLists.txt index d083cf00dde..930374270ed 100644 --- a/examples/widgets/painting/composition/CMakeLists.txt +++ b/examples/widgets/painting/composition/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(composition WIN32 MACOSX_BUNDLE +add_qt_gui_executable(composition WIN32 MACOSX_BUNDLE # special case: remove files from ../shared composition.cpp composition.h composition.qrc main.cpp diff --git a/examples/widgets/painting/concentriccircles/CMakeLists.txt b/examples/widgets/painting/concentriccircles/CMakeLists.txt index edbfea218d8..6005d5e8065 100644 --- a/examples/widgets/painting/concentriccircles/CMakeLists.txt +++ b/examples/widgets/painting/concentriccircles/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(concentriccircles WIN32 MACOSX_BUNDLE +add_qt_gui_executable(concentriccircles WIN32 MACOSX_BUNDLE circlewidget.cpp circlewidget.h main.cpp window.cpp window.h diff --git a/examples/widgets/painting/deform/CMakeLists.txt b/examples/widgets/painting/deform/CMakeLists.txt index 591bc552eae..56e1a2e9d2f 100644 --- a/examples/widgets/painting/deform/CMakeLists.txt +++ b/examples/widgets/painting/deform/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(deform WIN32 MACOSX_BUNDLE +add_qt_gui_executable(deform WIN32 MACOSX_BUNDLE # special case: remove files from ../shared deform.qrc main.cpp diff --git a/examples/widgets/painting/fontsampler/CMakeLists.txt b/examples/widgets/painting/fontsampler/CMakeLists.txt index e533cdb63a3..e0be3158f2d 100644 --- a/examples/widgets/painting/fontsampler/CMakeLists.txt +++ b/examples/widgets/painting/fontsampler/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(fontsampler WIN32 MACOSX_BUNDLE +add_qt_gui_executable(fontsampler WIN32 MACOSX_BUNDLE main.cpp mainwindow.cpp mainwindow.h mainwindowbase.ui diff --git a/examples/widgets/painting/gradients/CMakeLists.txt b/examples/widgets/painting/gradients/CMakeLists.txt index b25739e919e..69b7fac2947 100644 --- a/examples/widgets/painting/gradients/CMakeLists.txt +++ b/examples/widgets/painting/gradients/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(gradients WIN32 MACOSX_BUNDLE +add_qt_gui_executable(gradients WIN32 MACOSX_BUNDLE # special case: remove files from ../shared gradients.cpp gradients.h gradients.qrc main.cpp diff --git a/examples/widgets/painting/imagecomposition/CMakeLists.txt b/examples/widgets/painting/imagecomposition/CMakeLists.txt index 506a3d8510b..1fcedbcc9fb 100644 --- a/examples/widgets/painting/imagecomposition/CMakeLists.txt +++ b/examples/widgets/painting/imagecomposition/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(imagecomposition WIN32 MACOSX_BUNDLE +add_qt_gui_executable(imagecomposition WIN32 MACOSX_BUNDLE imagecomposer.cpp imagecomposer.h imagecomposition.qrc main.cpp diff --git a/examples/widgets/painting/painterpaths/CMakeLists.txt b/examples/widgets/painting/painterpaths/CMakeLists.txt index 423d7d98ed9..56007a3e548 100644 --- a/examples/widgets/painting/painterpaths/CMakeLists.txt +++ b/examples/widgets/painting/painterpaths/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(painterpaths WIN32 MACOSX_BUNDLE +add_qt_gui_executable(painterpaths WIN32 MACOSX_BUNDLE main.cpp renderarea.cpp renderarea.h window.cpp window.h diff --git a/examples/widgets/painting/pathstroke/CMakeLists.txt b/examples/widgets/painting/pathstroke/CMakeLists.txt index ce32f385499..fac73d2a534 100644 --- a/examples/widgets/painting/pathstroke/CMakeLists.txt +++ b/examples/widgets/painting/pathstroke/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(pathstroke WIN32 MACOSX_BUNDLE +add_qt_gui_executable(pathstroke WIN32 MACOSX_BUNDLE ../shared/arthurstyle.cpp ../shared/arthurstyle.h ../shared/arthurwidgets.cpp ../shared/arthurwidgets.h ../shared/hoverpoints.cpp ../shared/hoverpoints.h diff --git a/examples/widgets/painting/transformations/CMakeLists.txt b/examples/widgets/painting/transformations/CMakeLists.txt index 5837f90f9d9..3218073a961 100644 --- a/examples/widgets/painting/transformations/CMakeLists.txt +++ b/examples/widgets/painting/transformations/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(transformations WIN32 MACOSX_BUNDLE +add_qt_gui_executable(transformations WIN32 MACOSX_BUNDLE main.cpp renderarea.cpp renderarea.h window.cpp window.h diff --git a/examples/widgets/richtext/calendar/CMakeLists.txt b/examples/widgets/richtext/calendar/CMakeLists.txt index 099991172d6..803deb9243e 100644 --- a/examples/widgets/richtext/calendar/CMakeLists.txt +++ b/examples/widgets/richtext/calendar/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(calendar WIN32 MACOSX_BUNDLE +add_qt_gui_executable(calendar WIN32 MACOSX_BUNDLE main.cpp mainwindow.cpp mainwindow.h ) diff --git a/examples/widgets/richtext/orderform/CMakeLists.txt b/examples/widgets/richtext/orderform/CMakeLists.txt index 9dd715c752a..4fc3c579192 100644 --- a/examples/widgets/richtext/orderform/CMakeLists.txt +++ b/examples/widgets/richtext/orderform/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) find_package(Qt5 COMPONENTS PrintSupport) -add_executable(orderform WIN32 MACOSX_BUNDLE +add_qt_gui_executable(orderform WIN32 MACOSX_BUNDLE detailsdialog.cpp detailsdialog.h main.cpp mainwindow.cpp mainwindow.h diff --git a/examples/widgets/richtext/syntaxhighlighter/CMakeLists.txt b/examples/widgets/richtext/syntaxhighlighter/CMakeLists.txt index 918843e1bd6..d70211e24cb 100644 --- a/examples/widgets/richtext/syntaxhighlighter/CMakeLists.txt +++ b/examples/widgets/richtext/syntaxhighlighter/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(syntaxhighlighter WIN32 MACOSX_BUNDLE +add_qt_gui_executable(syntaxhighlighter WIN32 MACOSX_BUNDLE highlighter.cpp highlighter.h main.cpp mainwindow.cpp mainwindow.h diff --git a/examples/widgets/richtext/textedit/CMakeLists.txt b/examples/widgets/richtext/textedit/CMakeLists.txt index 54689bae5b5..602baa84f27 100644 --- a/examples/widgets/richtext/textedit/CMakeLists.txt +++ b/examples/widgets/richtext/textedit/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) find_package(Qt5 COMPONENTS PrintSupport) # special case -add_executable(textedit WIN32 MACOSX_BUNDLE +add_qt_gui_executable(textedit WIN32 MACOSX_BUNDLE main.cpp textedit.cpp textedit.h textedit.qrc ) diff --git a/examples/widgets/scroller/graphicsview/CMakeLists.txt b/examples/widgets/scroller/graphicsview/CMakeLists.txt index 5b36cfc9aed..53ce4ff2477 100644 --- a/examples/widgets/scroller/graphicsview/CMakeLists.txt +++ b/examples/widgets/scroller/graphicsview/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(graphicsview WIN32 MACOSX_BUNDLE +add_qt_gui_executable(graphicsview WIN32 MACOSX_BUNDLE main.cpp ) target_link_libraries(graphicsview PUBLIC diff --git a/examples/widgets/statemachine/eventtransitions/CMakeLists.txt b/examples/widgets/statemachine/eventtransitions/CMakeLists.txt index 758265686b9..21372f8856a 100644 --- a/examples/widgets/statemachine/eventtransitions/CMakeLists.txt +++ b/examples/widgets/statemachine/eventtransitions/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(eventtransitions WIN32 MACOSX_BUNDLE +add_qt_gui_executable(eventtransitions WIN32 MACOSX_BUNDLE main.cpp ) target_link_libraries(eventtransitions PUBLIC diff --git a/examples/widgets/statemachine/rogue/CMakeLists.txt b/examples/widgets/statemachine/rogue/CMakeLists.txt index 7ce3c5c9660..1ae6b511da8 100644 --- a/examples/widgets/statemachine/rogue/CMakeLists.txt +++ b/examples/widgets/statemachine/rogue/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(rogue WIN32 MACOSX_BUNDLE +add_qt_gui_executable(rogue WIN32 MACOSX_BUNDLE main.cpp movementtransition.h window.cpp window.h diff --git a/examples/widgets/statemachine/trafficlight/CMakeLists.txt b/examples/widgets/statemachine/trafficlight/CMakeLists.txt index 3325c5fe465..0122fa72cd5 100644 --- a/examples/widgets/statemachine/trafficlight/CMakeLists.txt +++ b/examples/widgets/statemachine/trafficlight/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(trafficlight WIN32 MACOSX_BUNDLE +add_qt_gui_executable(trafficlight WIN32 MACOSX_BUNDLE main.cpp ) target_link_libraries(trafficlight PUBLIC diff --git a/examples/widgets/statemachine/twowaybutton/CMakeLists.txt b/examples/widgets/statemachine/twowaybutton/CMakeLists.txt index 3ea05f9595a..6c68cdd2fb5 100644 --- a/examples/widgets/statemachine/twowaybutton/CMakeLists.txt +++ b/examples/widgets/statemachine/twowaybutton/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(twowaybutton WIN32 MACOSX_BUNDLE +add_qt_gui_executable(twowaybutton WIN32 MACOSX_BUNDLE main.cpp ) target_link_libraries(twowaybutton PUBLIC diff --git a/examples/widgets/tools/codecs/CMakeLists.txt b/examples/widgets/tools/codecs/CMakeLists.txt index 99040e807ea..0bb5f379380 100644 --- a/examples/widgets/tools/codecs/CMakeLists.txt +++ b/examples/widgets/tools/codecs/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(codecs WIN32 MACOSX_BUNDLE +add_qt_gui_executable(codecs WIN32 MACOSX_BUNDLE codecs.qrc encodingdialog.cpp encodingdialog.h main.cpp diff --git a/examples/widgets/tools/completer/CMakeLists.txt b/examples/widgets/tools/completer/CMakeLists.txt index 9db2d089d93..8e86cc6b897 100644 --- a/examples/widgets/tools/completer/CMakeLists.txt +++ b/examples/widgets/tools/completer/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(completer WIN32 MACOSX_BUNDLE +add_qt_gui_executable(completer WIN32 MACOSX_BUNDLE completer.qrc fsmodel.cpp fsmodel.h main.cpp diff --git a/examples/widgets/tools/customcompleter/CMakeLists.txt b/examples/widgets/tools/customcompleter/CMakeLists.txt index 7c1db10befe..7ac00d7345a 100644 --- a/examples/widgets/tools/customcompleter/CMakeLists.txt +++ b/examples/widgets/tools/customcompleter/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(customcompleter WIN32 MACOSX_BUNDLE +add_qt_gui_executable(customcompleter WIN32 MACOSX_BUNDLE customcompleter.qrc main.cpp mainwindow.cpp mainwindow.h diff --git a/examples/widgets/tools/echoplugin/echowindow/CMakeLists.txt b/examples/widgets/tools/echoplugin/echowindow/CMakeLists.txt index 941007505d6..20615d1e3bc 100644 --- a/examples/widgets/tools/echoplugin/echowindow/CMakeLists.txt +++ b/examples/widgets/tools/echoplugin/echowindow/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(echopluginwindow WIN32 MACOSX_BUNDLE # special case: renamed target +add_qt_gui_executable(echopluginwindow WIN32 MACOSX_BUNDLE # special case: renamed target echointerface.h echowindow.cpp echowindow.h main.cpp diff --git a/examples/widgets/tools/i18n/CMakeLists.txt b/examples/widgets/tools/i18n/CMakeLists.txt index 3835cc27ea6..a0347d8453f 100644 --- a/examples/widgets/tools/i18n/CMakeLists.txt +++ b/examples/widgets/tools/i18n/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(i18n WIN32 MACOSX_BUNDLE +add_qt_gui_executable(i18n WIN32 MACOSX_BUNDLE i18n.qrc languagechooser.cpp languagechooser.h main.cpp diff --git a/examples/widgets/tools/plugandpaint/app/CMakeLists.txt b/examples/widgets/tools/plugandpaint/app/CMakeLists.txt index 2e730791cc4..a7c642a1beb 100644 --- a/examples/widgets/tools/plugandpaint/app/CMakeLists.txt +++ b/examples/widgets/tools/plugandpaint/app/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(plugandpaint WIN32 MACOSX_BUNDLE +add_qt_gui_executable(plugandpaint WIN32 MACOSX_BUNDLE interfaces.h main.cpp mainwindow.cpp mainwindow.h diff --git a/examples/widgets/tools/regexp/CMakeLists.txt b/examples/widgets/tools/regexp/CMakeLists.txt index 026e72673a3..0b64cf06f8e 100644 --- a/examples/widgets/tools/regexp/CMakeLists.txt +++ b/examples/widgets/tools/regexp/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(regexp WIN32 MACOSX_BUNDLE +add_qt_gui_executable(regexp WIN32 MACOSX_BUNDLE main.cpp regexpdialog.cpp regexpdialog.h ) diff --git a/examples/widgets/tools/regularexpression/CMakeLists.txt b/examples/widgets/tools/regularexpression/CMakeLists.txt index ba7274b007e..a9ce374ce22 100644 --- a/examples/widgets/tools/regularexpression/CMakeLists.txt +++ b/examples/widgets/tools/regularexpression/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(regularexpression WIN32 MACOSX_BUNDLE +add_qt_gui_executable(regularexpression WIN32 MACOSX_BUNDLE main.cpp regularexpression.qrc regularexpressiondialog.cpp regularexpressiondialog.h diff --git a/examples/widgets/tools/settingseditor/CMakeLists.txt b/examples/widgets/tools/settingseditor/CMakeLists.txt index 7bfa75cade5..49a014e3590 100644 --- a/examples/widgets/tools/settingseditor/CMakeLists.txt +++ b/examples/widgets/tools/settingseditor/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(settingseditor WIN32 MACOSX_BUNDLE +add_qt_gui_executable(settingseditor WIN32 MACOSX_BUNDLE locationdialog.cpp locationdialog.h main.cpp mainwindow.cpp mainwindow.h diff --git a/examples/widgets/tools/styleplugin/stylewindow/CMakeLists.txt b/examples/widgets/tools/styleplugin/stylewindow/CMakeLists.txt index 3e3893ad03c..6e470824711 100644 --- a/examples/widgets/tools/styleplugin/stylewindow/CMakeLists.txt +++ b/examples/widgets/tools/styleplugin/stylewindow/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(styleplugin WIN32 MACOSX_BUNDLE +add_qt_gui_executable(styleplugin WIN32 MACOSX_BUNDLE main.cpp stylewindow.cpp stylewindow.h ) diff --git a/examples/widgets/tools/treemodelcompleter/CMakeLists.txt b/examples/widgets/tools/treemodelcompleter/CMakeLists.txt index a6bd7177f10..9fa16e06dd0 100644 --- a/examples/widgets/tools/treemodelcompleter/CMakeLists.txt +++ b/examples/widgets/tools/treemodelcompleter/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(treemodelcompleter WIN32 MACOSX_BUNDLE +add_qt_gui_executable(treemodelcompleter WIN32 MACOSX_BUNDLE main.cpp mainwindow.cpp mainwindow.h treemodelcompleter.cpp treemodelcompleter.h treemodelcompleter.qrc diff --git a/examples/widgets/tools/undo/CMakeLists.txt b/examples/widgets/tools/undo/CMakeLists.txt index 5cd91dda0a2..bc4a8762113 100644 --- a/examples/widgets/tools/undo/CMakeLists.txt +++ b/examples/widgets/tools/undo/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(undo WIN32 MACOSX_BUNDLE +add_qt_gui_executable(undo WIN32 MACOSX_BUNDLE commands.cpp commands.h document.cpp document.h main.cpp diff --git a/examples/widgets/tools/undoframework/CMakeLists.txt b/examples/widgets/tools/undoframework/CMakeLists.txt index a1a6c2c624f..064cb651507 100644 --- a/examples/widgets/tools/undoframework/CMakeLists.txt +++ b/examples/widgets/tools/undoframework/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(undoframework WIN32 MACOSX_BUNDLE +add_qt_gui_executable(undoframework WIN32 MACOSX_BUNDLE commands.cpp commands.h diagramitem.cpp diagramitem.h diagramscene.cpp diagramscene.h diff --git a/examples/widgets/touch/dials/CMakeLists.txt b/examples/widgets/touch/dials/CMakeLists.txt index 0589e555f3e..fa31852b3df 100644 --- a/examples/widgets/touch/dials/CMakeLists.txt +++ b/examples/widgets/touch/dials/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(dials WIN32 MACOSX_BUNDLE +add_qt_gui_executable(dials WIN32 MACOSX_BUNDLE dials.ui main.cpp ) diff --git a/examples/widgets/touch/fingerpaint/CMakeLists.txt b/examples/widgets/touch/fingerpaint/CMakeLists.txt index a419a614be8..606e6bbc64f 100644 --- a/examples/widgets/touch/fingerpaint/CMakeLists.txt +++ b/examples/widgets/touch/fingerpaint/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) find_package(Qt5 COMPONENTS PrintSupport) # special case -add_executable(fingerpaint WIN32 MACOSX_BUNDLE +add_qt_gui_executable(fingerpaint WIN32 MACOSX_BUNDLE main.cpp mainwindow.cpp mainwindow.h scribblearea.cpp scribblearea.h diff --git a/examples/widgets/touch/knobs/CMakeLists.txt b/examples/widgets/touch/knobs/CMakeLists.txt index 4a8f55820a9..c23a11f0247 100644 --- a/examples/widgets/touch/knobs/CMakeLists.txt +++ b/examples/widgets/touch/knobs/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(knobs WIN32 MACOSX_BUNDLE +add_qt_gui_executable(knobs WIN32 MACOSX_BUNDLE knob.cpp knob.h main.cpp ) diff --git a/examples/widgets/touch/pinchzoom/CMakeLists.txt b/examples/widgets/touch/pinchzoom/CMakeLists.txt index 379dde1e9f3..44951db7277 100644 --- a/examples/widgets/touch/pinchzoom/CMakeLists.txt +++ b/examples/widgets/touch/pinchzoom/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(pinchzoom WIN32 MACOSX_BUNDLE +add_qt_gui_executable(pinchzoom WIN32 MACOSX_BUNDLE graphicsview.cpp graphicsview.h main.cpp mice.qrc diff --git a/examples/widgets/tutorials/addressbook/part1/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part1/CMakeLists.txt index 14533cb8dce..6c333420f49 100644 --- a/examples/widgets/tutorials/addressbook/part1/CMakeLists.txt +++ b/examples/widgets/tutorials/addressbook/part1/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(part1 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(part1 WIN32 MACOSX_BUNDLE addressbook.cpp addressbook.h main.cpp ) diff --git a/examples/widgets/tutorials/addressbook/part2/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part2/CMakeLists.txt index aace9f86af8..2c5d438bc5b 100644 --- a/examples/widgets/tutorials/addressbook/part2/CMakeLists.txt +++ b/examples/widgets/tutorials/addressbook/part2/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(part2 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(part2 WIN32 MACOSX_BUNDLE addressbook.cpp addressbook.h main.cpp ) diff --git a/examples/widgets/tutorials/addressbook/part3/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part3/CMakeLists.txt index b9fadf57d04..5be04b1e2f3 100644 --- a/examples/widgets/tutorials/addressbook/part3/CMakeLists.txt +++ b/examples/widgets/tutorials/addressbook/part3/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(part3 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(part3 WIN32 MACOSX_BUNDLE addressbook.cpp addressbook.h main.cpp ) diff --git a/examples/widgets/tutorials/addressbook/part4/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part4/CMakeLists.txt index af8dfd49046..309e8eea668 100644 --- a/examples/widgets/tutorials/addressbook/part4/CMakeLists.txt +++ b/examples/widgets/tutorials/addressbook/part4/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(part4 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(part4 WIN32 MACOSX_BUNDLE addressbook.cpp addressbook.h main.cpp ) diff --git a/examples/widgets/tutorials/addressbook/part5/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part5/CMakeLists.txt index eec0af2bac6..9d73fd0e96e 100644 --- a/examples/widgets/tutorials/addressbook/part5/CMakeLists.txt +++ b/examples/widgets/tutorials/addressbook/part5/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(part5 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(part5 WIN32 MACOSX_BUNDLE addressbook.cpp addressbook.h finddialog.cpp finddialog.h main.cpp diff --git a/examples/widgets/tutorials/addressbook/part6/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part6/CMakeLists.txt index 294f16a26d5..015a4cb244e 100644 --- a/examples/widgets/tutorials/addressbook/part6/CMakeLists.txt +++ b/examples/widgets/tutorials/addressbook/part6/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(part6 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(part6 WIN32 MACOSX_BUNDLE addressbook.cpp addressbook.h finddialog.cpp finddialog.h main.cpp diff --git a/examples/widgets/tutorials/addressbook/part7/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part7/CMakeLists.txt index 3d50ebcc6ca..acb3a2903ba 100644 --- a/examples/widgets/tutorials/addressbook/part7/CMakeLists.txt +++ b/examples/widgets/tutorials/addressbook/part7/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(part7 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(part7 WIN32 MACOSX_BUNDLE addressbook.cpp addressbook.h finddialog.cpp finddialog.h main.cpp diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part1/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/part1/CMakeLists.txt index 50f6e31364d..c148f20a035 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part1/CMakeLists.txt +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part1/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(part1 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(part1 WIN32 MACOSX_BUNDLE main.cpp ) target_link_libraries(part1 PUBLIC diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part2/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/part2/CMakeLists.txt index 9df643de4aa..ddbef50ca23 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part2/CMakeLists.txt +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part2/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(part2 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(part2 WIN32 MACOSX_BUNDLE main.cpp ) target_link_libraries(part2 PUBLIC diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part3/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/part3/CMakeLists.txt index 048d2d60abc..66cd8827cfa 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part3/CMakeLists.txt +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part3/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(part3 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(part3 WIN32 MACOSX_BUNDLE main.cpp ) target_link_libraries(part3 PUBLIC diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part4/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/part4/CMakeLists.txt index c752b44d04f..0c7b9f62f97 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part4/CMakeLists.txt +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part4/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(part4 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(part4 WIN32 MACOSX_BUNDLE main.cpp ) target_link_libraries(part4 PUBLIC diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part5/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/part5/CMakeLists.txt index fc4fd05b6e0..4fc0df77b78 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part5/CMakeLists.txt +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part5/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(part5 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(part5 WIN32 MACOSX_BUNDLE main.cpp ) target_link_libraries(part5 PUBLIC diff --git a/examples/widgets/tutorials/modelview/1_readonly/CMakeLists.txt b/examples/widgets/tutorials/modelview/1_readonly/CMakeLists.txt index 82e1b4dbab6..ee859409e51 100644 --- a/examples/widgets/tutorials/modelview/1_readonly/CMakeLists.txt +++ b/examples/widgets/tutorials/modelview/1_readonly/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(mv_readonly WIN32 MACOSX_BUNDLE +add_qt_gui_executable(mv_readonly WIN32 MACOSX_BUNDLE main.cpp mymodel.cpp mymodel.h ) diff --git a/examples/widgets/tutorials/modelview/2_formatting/CMakeLists.txt b/examples/widgets/tutorials/modelview/2_formatting/CMakeLists.txt index 898df9bfbfb..75c5f431c1e 100644 --- a/examples/widgets/tutorials/modelview/2_formatting/CMakeLists.txt +++ b/examples/widgets/tutorials/modelview/2_formatting/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(mv_formatting WIN32 MACOSX_BUNDLE +add_qt_gui_executable(mv_formatting WIN32 MACOSX_BUNDLE main.cpp mymodel.cpp mymodel.h ) diff --git a/examples/widgets/tutorials/modelview/3_changingmodel/CMakeLists.txt b/examples/widgets/tutorials/modelview/3_changingmodel/CMakeLists.txt index b460b7b2816..60d240f1704 100644 --- a/examples/widgets/tutorials/modelview/3_changingmodel/CMakeLists.txt +++ b/examples/widgets/tutorials/modelview/3_changingmodel/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(mv_changingmodel WIN32 MACOSX_BUNDLE +add_qt_gui_executable(mv_changingmodel WIN32 MACOSX_BUNDLE main.cpp mymodel.cpp mymodel.h ) diff --git a/examples/widgets/tutorials/modelview/4_headers/CMakeLists.txt b/examples/widgets/tutorials/modelview/4_headers/CMakeLists.txt index e76299ee0c8..b719caf8ecb 100644 --- a/examples/widgets/tutorials/modelview/4_headers/CMakeLists.txt +++ b/examples/widgets/tutorials/modelview/4_headers/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(mv_headers WIN32 MACOSX_BUNDLE +add_qt_gui_executable(mv_headers WIN32 MACOSX_BUNDLE main.cpp mymodel.cpp mymodel.h ) diff --git a/examples/widgets/tutorials/modelview/5_edit/CMakeLists.txt b/examples/widgets/tutorials/modelview/5_edit/CMakeLists.txt index ceb2ef0ed52..67c34521f49 100644 --- a/examples/widgets/tutorials/modelview/5_edit/CMakeLists.txt +++ b/examples/widgets/tutorials/modelview/5_edit/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(mv_edit WIN32 MACOSX_BUNDLE +add_qt_gui_executable(mv_edit WIN32 MACOSX_BUNDLE main.cpp mainwindow.cpp mainwindow.h mymodel.cpp mymodel.h diff --git a/examples/widgets/tutorials/modelview/6_treeview/CMakeLists.txt b/examples/widgets/tutorials/modelview/6_treeview/CMakeLists.txt index f6409036fd9..2feb364569d 100644 --- a/examples/widgets/tutorials/modelview/6_treeview/CMakeLists.txt +++ b/examples/widgets/tutorials/modelview/6_treeview/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(mv_tree WIN32 MACOSX_BUNDLE +add_qt_gui_executable(mv_tree WIN32 MACOSX_BUNDLE main.cpp mainwindow.cpp mainwindow.h ) diff --git a/examples/widgets/tutorials/modelview/7_selections/CMakeLists.txt b/examples/widgets/tutorials/modelview/7_selections/CMakeLists.txt index f328863a1f7..a974313bd75 100644 --- a/examples/widgets/tutorials/modelview/7_selections/CMakeLists.txt +++ b/examples/widgets/tutorials/modelview/7_selections/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(mv_selections WIN32 MACOSX_BUNDLE +add_qt_gui_executable(mv_selections WIN32 MACOSX_BUNDLE main.cpp mainwindow.cpp mainwindow.h ) diff --git a/examples/widgets/tutorials/notepad/CMakeLists.txt b/examples/widgets/tutorials/notepad/CMakeLists.txt index fee3e14285a..44606d522c8 100644 --- a/examples/widgets/tutorials/notepad/CMakeLists.txt +++ b/examples/widgets/tutorials/notepad/CMakeLists.txt @@ -14,7 +14,7 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -add_executable(notepad WIN32 MACOSX_BUNDLE +add_qt_gui_executable(notepad WIN32 MACOSX_BUNDLE main.cpp notepad.cpp notepad.h notepad.qrc notepad.ui ) diff --git a/examples/widgets/tutorials/widgets/childwidget/CMakeLists.txt b/examples/widgets/tutorials/widgets/childwidget/CMakeLists.txt index 6725ad69f50..b5fb51c77df 100644 --- a/examples/widgets/tutorials/widgets/childwidget/CMakeLists.txt +++ b/examples/widgets/tutorials/widgets/childwidget/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(childwidget WIN32 MACOSX_BUNDLE +add_qt_gui_executable(childwidget WIN32 MACOSX_BUNDLE main.cpp ) target_link_libraries(childwidget PUBLIC diff --git a/examples/widgets/tutorials/widgets/nestedlayouts/CMakeLists.txt b/examples/widgets/tutorials/widgets/nestedlayouts/CMakeLists.txt index 32ca867208b..e963dd77f31 100644 --- a/examples/widgets/tutorials/widgets/nestedlayouts/CMakeLists.txt +++ b/examples/widgets/tutorials/widgets/nestedlayouts/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(nestedlayouts WIN32 MACOSX_BUNDLE +add_qt_gui_executable(nestedlayouts WIN32 MACOSX_BUNDLE main.cpp ) target_link_libraries(nestedlayouts PUBLIC diff --git a/examples/widgets/tutorials/widgets/toplevel/CMakeLists.txt b/examples/widgets/tutorials/widgets/toplevel/CMakeLists.txt index b18e09a2782..b607403c55c 100644 --- a/examples/widgets/tutorials/widgets/toplevel/CMakeLists.txt +++ b/examples/widgets/tutorials/widgets/toplevel/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(toplevel WIN32 MACOSX_BUNDLE +add_qt_gui_executable(toplevel WIN32 MACOSX_BUNDLE main.cpp ) target_link_libraries(toplevel PUBLIC diff --git a/examples/widgets/tutorials/widgets/windowlayout/CMakeLists.txt b/examples/widgets/tutorials/widgets/windowlayout/CMakeLists.txt index 4d8899227aa..a9db86bccf5 100644 --- a/examples/widgets/tutorials/widgets/windowlayout/CMakeLists.txt +++ b/examples/widgets/tutorials/widgets/windowlayout/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(windowlayout WIN32 MACOSX_BUNDLE +add_qt_gui_executable(windowlayout WIN32 MACOSX_BUNDLE main.cpp ) target_link_libraries(windowlayout PUBLIC diff --git a/examples/widgets/widgets/analogclock/CMakeLists.txt b/examples/widgets/widgets/analogclock/CMakeLists.txt index 064b9f23e86..32ed38e46a8 100644 --- a/examples/widgets/widgets/analogclock/CMakeLists.txt +++ b/examples/widgets/widgets/analogclock/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(analogclock WIN32 MACOSX_BUNDLE +add_qt_gui_executable(analogclock WIN32 MACOSX_BUNDLE analogclock.cpp analogclock.h main.cpp ) diff --git a/examples/widgets/widgets/calculator/CMakeLists.txt b/examples/widgets/widgets/calculator/CMakeLists.txt index 779272f31a9..cd8a8372817 100644 --- a/examples/widgets/widgets/calculator/CMakeLists.txt +++ b/examples/widgets/widgets/calculator/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(calculator WIN32 MACOSX_BUNDLE +add_qt_gui_executable(calculator WIN32 MACOSX_BUNDLE button.cpp button.h calculator.cpp calculator.h main.cpp diff --git a/examples/widgets/widgets/calendarwidget/CMakeLists.txt b/examples/widgets/widgets/calendarwidget/CMakeLists.txt index ed496bdad7d..4c09d47a170 100644 --- a/examples/widgets/widgets/calendarwidget/CMakeLists.txt +++ b/examples/widgets/widgets/calendarwidget/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(calendarwidget WIN32 MACOSX_BUNDLE +add_qt_gui_executable(calendarwidget WIN32 MACOSX_BUNDLE main.cpp window.cpp window.h ) diff --git a/examples/widgets/widgets/charactermap/CMakeLists.txt b/examples/widgets/widgets/charactermap/CMakeLists.txt index f397822c592..fdd5d75b26e 100644 --- a/examples/widgets/widgets/charactermap/CMakeLists.txt +++ b/examples/widgets/widgets/charactermap/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(charactermap WIN32 MACOSX_BUNDLE +add_qt_gui_executable(charactermap WIN32 MACOSX_BUNDLE characterwidget.cpp characterwidget.h main.cpp mainwindow.cpp mainwindow.h diff --git a/examples/widgets/widgets/codeeditor/CMakeLists.txt b/examples/widgets/widgets/codeeditor/CMakeLists.txt index f352b060cb5..8e3e3dbdc1d 100644 --- a/examples/widgets/widgets/codeeditor/CMakeLists.txt +++ b/examples/widgets/widgets/codeeditor/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(codeeditor WIN32 MACOSX_BUNDLE +add_qt_gui_executable(codeeditor WIN32 MACOSX_BUNDLE codeeditor.cpp codeeditor.h main.cpp ) diff --git a/examples/widgets/widgets/digitalclock/CMakeLists.txt b/examples/widgets/widgets/digitalclock/CMakeLists.txt index 505e6a67b62..978d208b954 100644 --- a/examples/widgets/widgets/digitalclock/CMakeLists.txt +++ b/examples/widgets/widgets/digitalclock/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(digitalclock WIN32 MACOSX_BUNDLE +add_qt_gui_executable(digitalclock WIN32 MACOSX_BUNDLE digitalclock.cpp digitalclock.h main.cpp ) diff --git a/examples/widgets/widgets/elidedlabel/CMakeLists.txt b/examples/widgets/widgets/elidedlabel/CMakeLists.txt index 1efb7a1bb3c..e21f5a1e15e 100644 --- a/examples/widgets/widgets/elidedlabel/CMakeLists.txt +++ b/examples/widgets/widgets/elidedlabel/CMakeLists.txt @@ -15,7 +15,7 @@ find_package(Qt5 COMPONENTS Core) find_package(Qt5 COMPONENTS Gui) find_package(Qt5 COMPONENTS Widgets) -add_executable(elidedlabel WIN32 MACOSX_BUNDLE +add_qt_gui_executable(elidedlabel WIN32 MACOSX_BUNDLE elidedlabel.cpp elidedlabel.h main.cpp testwidget.cpp testwidget.h diff --git a/examples/widgets/widgets/groupbox/CMakeLists.txt b/examples/widgets/widgets/groupbox/CMakeLists.txt index 0b13e4587d2..f6d2769a65b 100644 --- a/examples/widgets/widgets/groupbox/CMakeLists.txt +++ b/examples/widgets/widgets/groupbox/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(groupbox WIN32 MACOSX_BUNDLE +add_qt_gui_executable(groupbox WIN32 MACOSX_BUNDLE main.cpp window.cpp window.h ) diff --git a/examples/widgets/widgets/icons/CMakeLists.txt b/examples/widgets/widgets/icons/CMakeLists.txt index ef20d8d2b09..0306ff69204 100644 --- a/examples/widgets/widgets/icons/CMakeLists.txt +++ b/examples/widgets/widgets/icons/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(icons WIN32 MACOSX_BUNDLE +add_qt_gui_executable(icons WIN32 MACOSX_BUNDLE iconpreviewarea.cpp iconpreviewarea.h iconsizespinbox.cpp iconsizespinbox.h imagedelegate.cpp imagedelegate.h diff --git a/examples/widgets/widgets/imageviewer/CMakeLists.txt b/examples/widgets/widgets/imageviewer/CMakeLists.txt index 49695865c76..3bdcc27d9e3 100644 --- a/examples/widgets/widgets/imageviewer/CMakeLists.txt +++ b/examples/widgets/widgets/imageviewer/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) find_package(Qt5 COMPONENTS PrintSupport) # special case -add_executable(imageviewer WIN32 MACOSX_BUNDLE +add_qt_gui_executable(imageviewer WIN32 MACOSX_BUNDLE imageviewer.cpp imageviewer.h main.cpp ) diff --git a/examples/widgets/widgets/lineedits/CMakeLists.txt b/examples/widgets/widgets/lineedits/CMakeLists.txt index eb8f210f6cb..0d39f973152 100644 --- a/examples/widgets/widgets/lineedits/CMakeLists.txt +++ b/examples/widgets/widgets/lineedits/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(lineedits WIN32 MACOSX_BUNDLE +add_qt_gui_executable(lineedits WIN32 MACOSX_BUNDLE main.cpp window.cpp window.h ) diff --git a/examples/widgets/widgets/mousebuttons/CMakeLists.txt b/examples/widgets/widgets/mousebuttons/CMakeLists.txt index 2746ca670a4..a2bf41193be 100644 --- a/examples/widgets/widgets/mousebuttons/CMakeLists.txt +++ b/examples/widgets/widgets/mousebuttons/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Core) find_package(Qt5 COMPONENTS Widgets) -add_executable(mousebuttons WIN32 MACOSX_BUNDLE +add_qt_gui_executable(mousebuttons WIN32 MACOSX_BUNDLE buttontester.cpp buttontester.h main.cpp ) diff --git a/examples/widgets/widgets/movie/CMakeLists.txt b/examples/widgets/widgets/movie/CMakeLists.txt index b96cce628e1..46c84740026 100644 --- a/examples/widgets/widgets/movie/CMakeLists.txt +++ b/examples/widgets/widgets/movie/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(movie WIN32 MACOSX_BUNDLE +add_qt_gui_executable(movie WIN32 MACOSX_BUNDLE main.cpp movieplayer.cpp movieplayer.h ) diff --git a/examples/widgets/widgets/scribble/CMakeLists.txt b/examples/widgets/widgets/scribble/CMakeLists.txt index 51db261f223..9fb19a64429 100644 --- a/examples/widgets/widgets/scribble/CMakeLists.txt +++ b/examples/widgets/widgets/scribble/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) find_package(Qt5 COMPONENTS PrintSupport) # special case -add_executable(scribble WIN32 MACOSX_BUNDLE +add_qt_gui_executable(scribble WIN32 MACOSX_BUNDLE main.cpp mainwindow.cpp mainwindow.h scribblearea.cpp scribblearea.h diff --git a/examples/widgets/widgets/shapedclock/CMakeLists.txt b/examples/widgets/widgets/shapedclock/CMakeLists.txt index 144d3006c54..60e2bd208e0 100644 --- a/examples/widgets/widgets/shapedclock/CMakeLists.txt +++ b/examples/widgets/widgets/shapedclock/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(shapedclock WIN32 MACOSX_BUNDLE +add_qt_gui_executable(shapedclock WIN32 MACOSX_BUNDLE main.cpp shapedclock.cpp shapedclock.h ) diff --git a/examples/widgets/widgets/sliders/CMakeLists.txt b/examples/widgets/widgets/sliders/CMakeLists.txt index bfdd22a7cc4..db365140074 100644 --- a/examples/widgets/widgets/sliders/CMakeLists.txt +++ b/examples/widgets/widgets/sliders/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(sliders WIN32 MACOSX_BUNDLE +add_qt_gui_executable(sliders WIN32 MACOSX_BUNDLE main.cpp slidersgroup.cpp slidersgroup.h window.cpp window.h diff --git a/examples/widgets/widgets/spinboxes/CMakeLists.txt b/examples/widgets/widgets/spinboxes/CMakeLists.txt index 680ecad2a81..6bb7618f6b1 100644 --- a/examples/widgets/widgets/spinboxes/CMakeLists.txt +++ b/examples/widgets/widgets/spinboxes/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(spinboxes WIN32 MACOSX_BUNDLE +add_qt_gui_executable(spinboxes WIN32 MACOSX_BUNDLE main.cpp window.cpp window.h ) diff --git a/examples/widgets/widgets/styles/CMakeLists.txt b/examples/widgets/widgets/styles/CMakeLists.txt index e0db35653ca..fd639e17ed3 100644 --- a/examples/widgets/widgets/styles/CMakeLists.txt +++ b/examples/widgets/widgets/styles/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(styles WIN32 MACOSX_BUNDLE +add_qt_gui_executable(styles WIN32 MACOSX_BUNDLE main.cpp norwegianwoodstyle.cpp norwegianwoodstyle.h styles.qrc diff --git a/examples/widgets/widgets/stylesheet/CMakeLists.txt b/examples/widgets/widgets/stylesheet/CMakeLists.txt index 7e99a396952..0a38fdd3e5f 100644 --- a/examples/widgets/widgets/stylesheet/CMakeLists.txt +++ b/examples/widgets/widgets/stylesheet/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(stylesheet WIN32 MACOSX_BUNDLE +add_qt_gui_executable(stylesheet WIN32 MACOSX_BUNDLE main.cpp mainwindow.cpp mainwindow.h mainwindow.ui stylesheet.qrc diff --git a/examples/widgets/widgets/tablet/CMakeLists.txt b/examples/widgets/widgets/tablet/CMakeLists.txt index febec2afd0c..ee9e2b7e269 100644 --- a/examples/widgets/widgets/tablet/CMakeLists.txt +++ b/examples/widgets/widgets/tablet/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(qttablet WIN32 MACOSX_BUNDLE +add_qt_gui_executable(qttablet WIN32 MACOSX_BUNDLE images.qrc main.cpp mainwindow.cpp mainwindow.h diff --git a/examples/widgets/widgets/tetrix/CMakeLists.txt b/examples/widgets/widgets/tetrix/CMakeLists.txt index ec795779289..205a0d27445 100644 --- a/examples/widgets/widgets/tetrix/CMakeLists.txt +++ b/examples/widgets/widgets/tetrix/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(tetrix WIN32 MACOSX_BUNDLE +add_qt_gui_executable(tetrix WIN32 MACOSX_BUNDLE main.cpp tetrixboard.cpp tetrixboard.h tetrixpiece.cpp tetrixpiece.h diff --git a/examples/widgets/widgets/tooltips/CMakeLists.txt b/examples/widgets/widgets/tooltips/CMakeLists.txt index 90601659f64..038a8881f2c 100644 --- a/examples/widgets/widgets/tooltips/CMakeLists.txt +++ b/examples/widgets/widgets/tooltips/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(tooltips WIN32 MACOSX_BUNDLE +add_qt_gui_executable(tooltips WIN32 MACOSX_BUNDLE main.cpp shapeitem.cpp shapeitem.h sortingbox.cpp sortingbox.h diff --git a/examples/widgets/widgets/validators/CMakeLists.txt b/examples/widgets/widgets/validators/CMakeLists.txt index b09d10dd9aa..5ed36901581 100644 --- a/examples/widgets/widgets/validators/CMakeLists.txt +++ b/examples/widgets/widgets/validators/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(validators WIN32 MACOSX_BUNDLE +add_qt_gui_executable(validators WIN32 MACOSX_BUNDLE ledwidget.cpp ledwidget.h localeselector.cpp localeselector.h main.cpp diff --git a/examples/widgets/widgets/wiggly/CMakeLists.txt b/examples/widgets/widgets/wiggly/CMakeLists.txt index 2fabcafb0e7..da0e64a8644 100644 --- a/examples/widgets/widgets/wiggly/CMakeLists.txt +++ b/examples/widgets/widgets/wiggly/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(wiggly WIN32 MACOSX_BUNDLE +add_qt_gui_executable(wiggly WIN32 MACOSX_BUNDLE dialog.cpp dialog.h main.cpp wigglywidget.cpp wigglywidget.h diff --git a/examples/widgets/widgets/windowflags/CMakeLists.txt b/examples/widgets/widgets/windowflags/CMakeLists.txt index 0eab6f64524..f7da42114d1 100644 --- a/examples/widgets/widgets/windowflags/CMakeLists.txt +++ b/examples/widgets/widgets/windowflags/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(windowflags WIN32 MACOSX_BUNDLE +add_qt_gui_executable(windowflags WIN32 MACOSX_BUNDLE controllerwindow.cpp controllerwindow.h main.cpp previewwindow.cpp previewwindow.h diff --git a/examples/widgets/windowcontainer/CMakeLists.txt b/examples/widgets/windowcontainer/CMakeLists.txt index f67a6515bde..80c8897c9b3 100644 --- a/examples/widgets/windowcontainer/CMakeLists.txt +++ b/examples/widgets/windowcontainer/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Widgets) -add_executable(windowcontainer WIN32 MACOSX_BUNDLE +add_qt_gui_executable(windowcontainer WIN32 MACOSX_BUNDLE ../../gui/openglwindow/openglwindow.cpp ../../gui/openglwindow/openglwindow.h windowcontainer.cpp ) diff --git a/examples/xml/dombookmarks/CMakeLists.txt b/examples/xml/dombookmarks/CMakeLists.txt index e7d5577b0e9..95e58c6025c 100644 --- a/examples/xml/dombookmarks/CMakeLists.txt +++ b/examples/xml/dombookmarks/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Xml) find_package(Qt5 COMPONENTS Widgets) -add_executable(dombookmarks WIN32 MACOSX_BUNDLE +add_qt_gui_executable(dombookmarks WIN32 MACOSX_BUNDLE main.cpp mainwindow.cpp mainwindow.h xbeltree.cpp xbeltree.h diff --git a/examples/xml/rsslisting/CMakeLists.txt b/examples/xml/rsslisting/CMakeLists.txt index f8c3a67c7fb..09879771ba5 100644 --- a/examples/xml/rsslisting/CMakeLists.txt +++ b/examples/xml/rsslisting/CMakeLists.txt @@ -15,7 +15,7 @@ find_package(Qt5 COMPONENTS Network) find_package(Qt5 COMPONENTS Xml) find_package(Qt5 COMPONENTS Widgets) -add_executable(rsslisting WIN32 MACOSX_BUNDLE +add_qt_gui_executable(rsslisting WIN32 MACOSX_BUNDLE main.cpp rsslisting.cpp rsslisting.h ) diff --git a/examples/xml/saxbookmarks/CMakeLists.txt b/examples/xml/saxbookmarks/CMakeLists.txt index 8d003a95a53..d5d8bba53a9 100644 --- a/examples/xml/saxbookmarks/CMakeLists.txt +++ b/examples/xml/saxbookmarks/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Xml) find_package(Qt5 COMPONENTS Widgets) -add_executable(saxbookmarks WIN32 MACOSX_BUNDLE +add_qt_gui_executable(saxbookmarks WIN32 MACOSX_BUNDLE main.cpp mainwindow.cpp mainwindow.h xbelgenerator.cpp xbelgenerator.h diff --git a/examples/xml/streambookmarks/CMakeLists.txt b/examples/xml/streambookmarks/CMakeLists.txt index 442e46ffd1a..3393c47a665 100644 --- a/examples/xml/streambookmarks/CMakeLists.txt +++ b/examples/xml/streambookmarks/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Xml) find_package(Qt5 COMPONENTS Widgets) -add_executable(streambookmarks WIN32 MACOSX_BUNDLE +add_qt_gui_executable(streambookmarks WIN32 MACOSX_BUNDLE main.cpp mainwindow.cpp mainwindow.h xbelreader.cpp xbelreader.h diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake index bae1518375b..8d4943aa3f3 100644 --- a/src/corelib/Qt5CoreMacros.cmake +++ b/src/corelib/Qt5CoreMacros.cmake @@ -388,3 +388,14 @@ if (NOT CMAKE_VERSION VERSION_LESS 2.8.9) endforeach() endmacro() endif() + +function(add_qt_gui_executable target) + add_executable(${ARGV}) + target_link_libraries("${target}" PRIVATE Qt::Core Qt::Gui) + + list(FIND ARGV WIN32 WIN32_OPTION_IDX) + if(WIN32 AND NOT WIN32_OPTION_IDX EQUAL -1) + target_link_libraries("${target}" PRIVATE Qt::WinMain) + endif() +endfunction() + diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index 94c79656386..5e4e9abc9e6 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -1711,7 +1711,7 @@ def write_example(cm_fh: typing.IO[str], scope: Scope, (public_libs, private_libs) = extract_cmake_libraries(scope) write_find_package_section(cm_fh, public_libs, private_libs, indent=indent) - add_executable = 'add_executable({}'.format(binary_name); + add_executable = 'add_{}executable({}'.format("qt_gui_" if gui else "", binary_name); if gui: add_executable += ' WIN32 MACOSX_BUNDLE'