From d60ebdda33f112bc0bcf619a1307250710f7e8d5 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 26 Oct 2020 17:34:34 +0100 Subject: CMake: Regenerate examples to set the WIN32_EXECUTABLE property As well as the MACOSX_BUNDLE properties as necessary. Task-number: QTBUG-87664 Change-Id: I26917656f6f2b653649765ebbea4e3f348b22ae7 Reviewed-by: Joerg Bornemann --- examples/assistant/remotecontrol/CMakeLists.txt | 4 ++++ examples/assistant/simpletextviewer/.prev_CMakeLists.txt | 4 ++++ examples/assistant/simpletextviewer/CMakeLists.txt | 4 ++++ examples/designer/calculatorbuilder/CMakeLists.txt | 4 ++++ examples/designer/calculatorform/CMakeLists.txt | 4 ++++ examples/designer/containerextension/.prev_CMakeLists.txt | 4 ++++ examples/designer/containerextension/CMakeLists.txt | 4 ++++ examples/designer/customwidgetplugin/.prev_CMakeLists.txt | 4 ++++ examples/designer/customwidgetplugin/CMakeLists.txt | 4 ++++ examples/designer/taskmenuextension/.prev_CMakeLists.txt | 4 ++++ examples/designer/taskmenuextension/CMakeLists.txt | 4 ++++ examples/designer/worldtimeclockbuilder/CMakeLists.txt | 4 ++++ examples/designer/worldtimeclockplugin/.prev_CMakeLists.txt | 4 ++++ examples/designer/worldtimeclockplugin/CMakeLists.txt | 4 ++++ examples/help/contextsensitivehelp/CMakeLists.txt | 4 ++++ examples/linguist/arrowpad/CMakeLists.txt | 4 ++++ examples/linguist/hellotr/CMakeLists.txt | 4 ++++ examples/linguist/trollprint/CMakeLists.txt | 4 ++++ examples/uitools/multipleinheritance/CMakeLists.txt | 4 ++++ examples/uitools/textfinder/CMakeLists.txt | 4 ++++ 20 files changed, 80 insertions(+) (limited to 'examples') diff --git a/examples/assistant/remotecontrol/CMakeLists.txt b/examples/assistant/remotecontrol/CMakeLists.txt index 2859ea839..6f80e0478 100644 --- a/examples/assistant/remotecontrol/CMakeLists.txt +++ b/examples/assistant/remotecontrol/CMakeLists.txt @@ -23,6 +23,10 @@ qt_add_executable(remotecontrol main.cpp remotecontrol.cpp remotecontrol.h remotecontrol.ui ) +set_target_properties(remotecontrol PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(remotecontrol PUBLIC Qt::Core Qt::Gui diff --git a/examples/assistant/simpletextviewer/.prev_CMakeLists.txt b/examples/assistant/simpletextviewer/.prev_CMakeLists.txt index f872c7450..772115941 100644 --- a/examples/assistant/simpletextviewer/.prev_CMakeLists.txt +++ b/examples/assistant/simpletextviewer/.prev_CMakeLists.txt @@ -26,6 +26,10 @@ qt_add_executable(simpletextviewer mainwindow.cpp mainwindow.h textedit.cpp textedit.h ) +set_target_properties(simpletextviewer PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_compile_definitions(simpletextviewer PUBLIC SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\" ) diff --git a/examples/assistant/simpletextviewer/CMakeLists.txt b/examples/assistant/simpletextviewer/CMakeLists.txt index 2c2b88569..734006256 100644 --- a/examples/assistant/simpletextviewer/CMakeLists.txt +++ b/examples/assistant/simpletextviewer/CMakeLists.txt @@ -26,6 +26,10 @@ qt_add_executable(simpletextviewer mainwindow.cpp mainwindow.h textedit.cpp textedit.h ) +set_target_properties(simpletextviewer PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_compile_definitions(simpletextviewer PUBLIC SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" # special case ) diff --git a/examples/designer/calculatorbuilder/CMakeLists.txt b/examples/designer/calculatorbuilder/CMakeLists.txt index 376be2700..2cb01e947 100644 --- a/examples/designer/calculatorbuilder/CMakeLists.txt +++ b/examples/designer/calculatorbuilder/CMakeLists.txt @@ -24,6 +24,10 @@ qt_add_executable(calculatorbuilder calculatorform.cpp calculatorform.h main.cpp ) +set_target_properties(calculatorbuilder PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(calculatorbuilder PUBLIC Qt::Core Qt::Gui diff --git a/examples/designer/calculatorform/CMakeLists.txt b/examples/designer/calculatorform/CMakeLists.txt index b9c11ba69..ad721d0cc 100644 --- a/examples/designer/calculatorform/CMakeLists.txt +++ b/examples/designer/calculatorform/CMakeLists.txt @@ -23,6 +23,10 @@ qt_add_executable(calculatorform calculatorform.cpp calculatorform.h calculatorform.ui main.cpp ) +set_target_properties(calculatorform PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(calculatorform PUBLIC Qt::Core Qt::Gui diff --git a/examples/designer/containerextension/.prev_CMakeLists.txt b/examples/designer/containerextension/.prev_CMakeLists.txt index 188ad7168..3225c4093 100644 --- a/examples/designer/containerextension/.prev_CMakeLists.txt +++ b/examples/designer/containerextension/.prev_CMakeLists.txt @@ -26,6 +26,10 @@ qt_add_executable(containerextension multipagewidgetextensionfactory.cpp multipagewidgetextensionfactory.h multipagewidgetplugin.cpp multipagewidgetplugin.h ) +set_target_properties(containerextension PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(containerextension PUBLIC Qt::Core Qt::Designer diff --git a/examples/designer/containerextension/CMakeLists.txt b/examples/designer/containerextension/CMakeLists.txt index e1c4d8a7e..1a6a0f61b 100644 --- a/examples/designer/containerextension/CMakeLists.txt +++ b/examples/designer/containerextension/CMakeLists.txt @@ -29,6 +29,10 @@ target_sources(containerextension PRIVATE multipagewidgetplugin.cpp multipagewidgetplugin.h ) # special case end +set_target_properties(containerextension PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(containerextension PUBLIC Qt::Core Qt::Designer diff --git a/examples/designer/customwidgetplugin/.prev_CMakeLists.txt b/examples/designer/customwidgetplugin/.prev_CMakeLists.txt index 4eec2c4b9..1e25517f8 100644 --- a/examples/designer/customwidgetplugin/.prev_CMakeLists.txt +++ b/examples/designer/customwidgetplugin/.prev_CMakeLists.txt @@ -24,6 +24,10 @@ qt_add_executable(customwidgetplugin analogclock.cpp analogclock.h customwidgetplugin.cpp customwidgetplugin.h ) +set_target_properties(customwidgetplugin PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(customwidgetplugin PUBLIC Qt::Core Qt::Gui diff --git a/examples/designer/customwidgetplugin/CMakeLists.txt b/examples/designer/customwidgetplugin/CMakeLists.txt index 0c7b7aefa..764fe7373 100644 --- a/examples/designer/customwidgetplugin/CMakeLists.txt +++ b/examples/designer/customwidgetplugin/CMakeLists.txt @@ -27,6 +27,10 @@ target_sources(customwidgetplugin PRIVATE customwidgetplugin.cpp customwidgetplugin.h ) # special case end +set_target_properties(customwidgetplugin PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(customwidgetplugin PUBLIC Qt::Core Qt::Gui diff --git a/examples/designer/taskmenuextension/.prev_CMakeLists.txt b/examples/designer/taskmenuextension/.prev_CMakeLists.txt index c1bf0f51d..8551d0a46 100644 --- a/examples/designer/taskmenuextension/.prev_CMakeLists.txt +++ b/examples/designer/taskmenuextension/.prev_CMakeLists.txt @@ -26,6 +26,10 @@ qt_add_executable(taskmenuextension tictactoeplugin.cpp tictactoeplugin.h tictactoetaskmenu.cpp tictactoetaskmenu.h ) +set_target_properties(taskmenuextension PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(taskmenuextension PUBLIC Qt::Core Qt::Designer diff --git a/examples/designer/taskmenuextension/CMakeLists.txt b/examples/designer/taskmenuextension/CMakeLists.txt index da08eaddc..a91b58eac 100644 --- a/examples/designer/taskmenuextension/CMakeLists.txt +++ b/examples/designer/taskmenuextension/CMakeLists.txt @@ -29,6 +29,10 @@ target_sources(taskmenuextension PRIVATE tictactoetaskmenu.cpp tictactoetaskmenu.h ) # special case end +set_target_properties(taskmenuextension PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(taskmenuextension PUBLIC Qt::Core Qt::Designer diff --git a/examples/designer/worldtimeclockbuilder/CMakeLists.txt b/examples/designer/worldtimeclockbuilder/CMakeLists.txt index a042c28a3..2c93155c7 100644 --- a/examples/designer/worldtimeclockbuilder/CMakeLists.txt +++ b/examples/designer/worldtimeclockbuilder/CMakeLists.txt @@ -23,6 +23,10 @@ find_package(Qt6 COMPONENTS UiTools) qt_add_executable(worldtimeclockbuilder main.cpp ) +set_target_properties(worldtimeclockbuilder PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(worldtimeclockbuilder PUBLIC Qt::Core Qt::Gui diff --git a/examples/designer/worldtimeclockplugin/.prev_CMakeLists.txt b/examples/designer/worldtimeclockplugin/.prev_CMakeLists.txt index ba606e2f7..1886b1ce6 100644 --- a/examples/designer/worldtimeclockplugin/.prev_CMakeLists.txt +++ b/examples/designer/worldtimeclockplugin/.prev_CMakeLists.txt @@ -24,6 +24,10 @@ qt_add_executable(worldtimeclockplugin worldtimeclock.cpp worldtimeclock.h worldtimeclockplugin.cpp worldtimeclockplugin.h ) +set_target_properties(worldtimeclockplugin PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(worldtimeclockplugin PUBLIC Qt::Core Qt::Gui diff --git a/examples/designer/worldtimeclockplugin/CMakeLists.txt b/examples/designer/worldtimeclockplugin/CMakeLists.txt index daff406c6..6e675fc9b 100644 --- a/examples/designer/worldtimeclockplugin/CMakeLists.txt +++ b/examples/designer/worldtimeclockplugin/CMakeLists.txt @@ -27,6 +27,10 @@ target_sources(worldtimeclockplugin PRIVATE worldtimeclockplugin.cpp worldtimeclockplugin.h ) # special case end +set_target_properties(worldtimeclockplugin PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(worldtimeclockplugin PUBLIC Qt::Core Qt::Gui diff --git a/examples/help/contextsensitivehelp/CMakeLists.txt b/examples/help/contextsensitivehelp/CMakeLists.txt index 4ad106c40..40d89a3e4 100644 --- a/examples/help/contextsensitivehelp/CMakeLists.txt +++ b/examples/help/contextsensitivehelp/CMakeLists.txt @@ -25,6 +25,10 @@ qt_add_executable(contextsensitivehelp main.cpp wateringconfigdialog.cpp wateringconfigdialog.h wateringconfigdialog.ui ) +set_target_properties(contextsensitivehelp PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(contextsensitivehelp PUBLIC Qt::Core Qt::Gui diff --git a/examples/linguist/arrowpad/CMakeLists.txt b/examples/linguist/arrowpad/CMakeLists.txt index e2fdf489e..cf652c8f2 100644 --- a/examples/linguist/arrowpad/CMakeLists.txt +++ b/examples/linguist/arrowpad/CMakeLists.txt @@ -24,6 +24,10 @@ qt_add_executable(arrowpad main.cpp mainwindow.cpp mainwindow.h ) +set_target_properties(arrowpad PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(arrowpad PUBLIC Qt::Core Qt::Gui diff --git a/examples/linguist/hellotr/CMakeLists.txt b/examples/linguist/hellotr/CMakeLists.txt index 06ad4c18b..c9c65ac6c 100644 --- a/examples/linguist/hellotr/CMakeLists.txt +++ b/examples/linguist/hellotr/CMakeLists.txt @@ -22,6 +22,10 @@ find_package(Qt6 COMPONENTS Widgets) qt_add_executable(hellotr main.cpp ) +set_target_properties(hellotr PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(hellotr PUBLIC Qt::Core Qt::Gui diff --git a/examples/linguist/trollprint/CMakeLists.txt b/examples/linguist/trollprint/CMakeLists.txt index 74b93af9b..e1c953cdf 100644 --- a/examples/linguist/trollprint/CMakeLists.txt +++ b/examples/linguist/trollprint/CMakeLists.txt @@ -24,6 +24,10 @@ qt_add_executable(trollprint mainwindow.cpp mainwindow.h printpanel.cpp printpanel.h ) +set_target_properties(trollprint PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(trollprint PUBLIC Qt::Core Qt::Gui diff --git a/examples/uitools/multipleinheritance/CMakeLists.txt b/examples/uitools/multipleinheritance/CMakeLists.txt index 94b5cd09f..7a942d53a 100644 --- a/examples/uitools/multipleinheritance/CMakeLists.txt +++ b/examples/uitools/multipleinheritance/CMakeLists.txt @@ -23,6 +23,10 @@ qt_add_executable(multipleinheritance calculatorform.cpp calculatorform.h calculatorform.ui main.cpp ) +set_target_properties(multipleinheritance PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(multipleinheritance PUBLIC Qt::Core Qt::Gui diff --git a/examples/uitools/textfinder/CMakeLists.txt b/examples/uitools/textfinder/CMakeLists.txt index 08e045b8f..84fbd72c4 100644 --- a/examples/uitools/textfinder/CMakeLists.txt +++ b/examples/uitools/textfinder/CMakeLists.txt @@ -24,6 +24,10 @@ qt_add_executable(textfinder main.cpp textfinder.cpp textfinder.h ) +set_target_properties(textfinder PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(textfinder PUBLIC Qt::Core Qt::Gui -- cgit v1.2.3