From 397b3725176780d8888f8499cac0127dbb7df2c7 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 26 Oct 2020 16:22:32 +0100 Subject: CMake: Regenerate examples to set the WIN32_EXECUTABLE property As well as the MACOSX_BUNDLE properties as necessary. Task-number: QTBUG-87664 Task-number: QTBUG-86827 Change-Id: I7677449a26d51fa853bd67bab6b3b61afbd2b12f Reviewed-by: Joerg Bornemann --- examples/widgets/tools/completer/CMakeLists.txt | 4 ++++ examples/widgets/tools/customcompleter/CMakeLists.txt | 4 ++++ examples/widgets/tools/echoplugin/echowindow/.prev_CMakeLists.txt | 4 ++++ examples/widgets/tools/echoplugin/echowindow/CMakeLists.txt | 4 ++++ examples/widgets/tools/echoplugin/plugin/CMakeLists.txt | 4 ++++ examples/widgets/tools/i18n/CMakeLists.txt | 4 ++++ examples/widgets/tools/plugandpaint/app/.prev_CMakeLists.txt | 4 ++++ examples/widgets/tools/plugandpaint/app/CMakeLists.txt | 4 ++++ examples/widgets/tools/plugandpaint/plugins/basictools/CMakeLists.txt | 4 ++++ .../widgets/tools/plugandpaint/plugins/extrafilters/CMakeLists.txt | 4 ++++ examples/widgets/tools/regularexpression/CMakeLists.txt | 4 ++++ examples/widgets/tools/settingseditor/CMakeLists.txt | 4 ++++ examples/widgets/tools/styleplugin/plugin/CMakeLists.txt | 4 ++++ examples/widgets/tools/styleplugin/stylewindow/CMakeLists.txt | 4 ++++ examples/widgets/tools/treemodelcompleter/CMakeLists.txt | 4 ++++ examples/widgets/tools/undo/CMakeLists.txt | 4 ++++ examples/widgets/tools/undoframework/CMakeLists.txt | 4 ++++ 17 files changed, 68 insertions(+) (limited to 'examples/widgets/tools') diff --git a/examples/widgets/tools/completer/CMakeLists.txt b/examples/widgets/tools/completer/CMakeLists.txt index 512d7a3864..a04d25f045 100644 --- a/examples/widgets/tools/completer/CMakeLists.txt +++ b/examples/widgets/tools/completer/CMakeLists.txt @@ -24,6 +24,10 @@ qt_add_executable(completer main.cpp mainwindow.cpp mainwindow.h ) +set_target_properties(completer PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(completer PUBLIC Qt::Core Qt::Gui diff --git a/examples/widgets/tools/customcompleter/CMakeLists.txt b/examples/widgets/tools/customcompleter/CMakeLists.txt index 0c17aaaaf1..13dd1123eb 100644 --- a/examples/widgets/tools/customcompleter/CMakeLists.txt +++ b/examples/widgets/tools/customcompleter/CMakeLists.txt @@ -24,6 +24,10 @@ qt_add_executable(customcompleter mainwindow.cpp mainwindow.h textedit.cpp textedit.h ) +set_target_properties(customcompleter PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(customcompleter PUBLIC Qt::Core Qt::Gui diff --git a/examples/widgets/tools/echoplugin/echowindow/.prev_CMakeLists.txt b/examples/widgets/tools/echoplugin/echowindow/.prev_CMakeLists.txt index 6bba4b9f77..1262ce5452 100644 --- a/examples/widgets/tools/echoplugin/echowindow/.prev_CMakeLists.txt +++ b/examples/widgets/tools/echoplugin/echowindow/.prev_CMakeLists.txt @@ -24,6 +24,10 @@ qt_add_executable(echoplugin echowindow.cpp echowindow.h main.cpp ) +set_target_properties(echoplugin PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(echoplugin PUBLIC Qt::Core Qt::Gui diff --git a/examples/widgets/tools/echoplugin/echowindow/CMakeLists.txt b/examples/widgets/tools/echoplugin/echowindow/CMakeLists.txt index 4ddd0bc4d7..3814fb235d 100644 --- a/examples/widgets/tools/echoplugin/echowindow/CMakeLists.txt +++ b/examples/widgets/tools/echoplugin/echowindow/CMakeLists.txt @@ -24,6 +24,10 @@ qt_add_executable(echopluginwindow # special case: renamed target echowindow.cpp echowindow.h main.cpp ) +set_target_properties(echopluginwindow PROPERTIES # special case + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(echopluginwindow PUBLIC # special case Qt::Core Qt::Gui diff --git a/examples/widgets/tools/echoplugin/plugin/CMakeLists.txt b/examples/widgets/tools/echoplugin/plugin/CMakeLists.txt index 1ca49a1aca..3e605cd2c9 100644 --- a/examples/widgets/tools/echoplugin/plugin/CMakeLists.txt +++ b/examples/widgets/tools/echoplugin/plugin/CMakeLists.txt @@ -23,6 +23,10 @@ qt_add_plugin(echoplugin) target_sources(echoplugin PRIVATE echoplugin.cpp echoplugin.h ) +set_target_properties(echoplugin PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_include_directories(echoplugin PUBLIC ../echowindow ) diff --git a/examples/widgets/tools/i18n/CMakeLists.txt b/examples/widgets/tools/i18n/CMakeLists.txt index 361453c8ad..7579853312 100644 --- a/examples/widgets/tools/i18n/CMakeLists.txt +++ b/examples/widgets/tools/i18n/CMakeLists.txt @@ -24,6 +24,10 @@ qt_add_executable(i18n main.cpp mainwindow.cpp mainwindow.h ) +set_target_properties(i18n PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(i18n PUBLIC Qt::Core Qt::Gui diff --git a/examples/widgets/tools/plugandpaint/app/.prev_CMakeLists.txt b/examples/widgets/tools/plugandpaint/app/.prev_CMakeLists.txt index db70d80ad6..feaac7ad8f 100644 --- a/examples/widgets/tools/plugandpaint/app/.prev_CMakeLists.txt +++ b/examples/widgets/tools/plugandpaint/app/.prev_CMakeLists.txt @@ -26,6 +26,10 @@ qt_add_executable(plugandpaint paintarea.cpp paintarea.h plugindialog.cpp plugindialog.h ) +set_target_properties(plugandpaint PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(plugandpaint PUBLIC # Remove: L../plugins Qt::Core diff --git a/examples/widgets/tools/plugandpaint/app/CMakeLists.txt b/examples/widgets/tools/plugandpaint/app/CMakeLists.txt index da4c568dc6..bdf934fa2c 100644 --- a/examples/widgets/tools/plugandpaint/app/CMakeLists.txt +++ b/examples/widgets/tools/plugandpaint/app/CMakeLists.txt @@ -26,6 +26,10 @@ qt_add_executable(plugandpaint paintarea.cpp paintarea.h plugindialog.cpp plugindialog.h ) +set_target_properties(plugandpaint PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(plugandpaint PUBLIC # Remove: L../plugins Qt::Core diff --git a/examples/widgets/tools/plugandpaint/plugins/basictools/CMakeLists.txt b/examples/widgets/tools/plugandpaint/plugins/basictools/CMakeLists.txt index 8baeb5357d..97e4021d61 100644 --- a/examples/widgets/tools/plugandpaint/plugins/basictools/CMakeLists.txt +++ b/examples/widgets/tools/plugandpaint/plugins/basictools/CMakeLists.txt @@ -23,6 +23,10 @@ qt_add_plugin(pnp_basictools STATIC) target_sources(pnp_basictools PRIVATE basictoolsplugin.cpp basictoolsplugin.h ) +set_target_properties(pnp_basictools PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_include_directories(pnp_basictools PUBLIC ../../app ) diff --git a/examples/widgets/tools/plugandpaint/plugins/extrafilters/CMakeLists.txt b/examples/widgets/tools/plugandpaint/plugins/extrafilters/CMakeLists.txt index 1c2d500497..bb6948e610 100644 --- a/examples/widgets/tools/plugandpaint/plugins/extrafilters/CMakeLists.txt +++ b/examples/widgets/tools/plugandpaint/plugins/extrafilters/CMakeLists.txt @@ -23,6 +23,10 @@ qt_add_plugin(pnp_extrafilters) target_sources(pnp_extrafilters PRIVATE extrafiltersplugin.cpp extrafiltersplugin.h ) +set_target_properties(pnp_extrafilters PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_include_directories(pnp_extrafilters PUBLIC ../../app ) diff --git a/examples/widgets/tools/regularexpression/CMakeLists.txt b/examples/widgets/tools/regularexpression/CMakeLists.txt index 7ffda47adb..c0dbf8e24e 100644 --- a/examples/widgets/tools/regularexpression/CMakeLists.txt +++ b/examples/widgets/tools/regularexpression/CMakeLists.txt @@ -23,6 +23,10 @@ qt_add_executable(regularexpression main.cpp regularexpressiondialog.cpp regularexpressiondialog.h ) +set_target_properties(regularexpression PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(regularexpression PUBLIC Qt::Core Qt::Gui diff --git a/examples/widgets/tools/settingseditor/CMakeLists.txt b/examples/widgets/tools/settingseditor/CMakeLists.txt index eda21b71e2..b875192bbb 100644 --- a/examples/widgets/tools/settingseditor/CMakeLists.txt +++ b/examples/widgets/tools/settingseditor/CMakeLists.txt @@ -26,6 +26,10 @@ qt_add_executable(settingseditor settingstree.cpp settingstree.h variantdelegate.cpp variantdelegate.h ) +set_target_properties(settingseditor PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(settingseditor PUBLIC Qt::Core Qt::Gui diff --git a/examples/widgets/tools/styleplugin/plugin/CMakeLists.txt b/examples/widgets/tools/styleplugin/plugin/CMakeLists.txt index 84266d0068..d3899bc0f4 100644 --- a/examples/widgets/tools/styleplugin/plugin/CMakeLists.txt +++ b/examples/widgets/tools/styleplugin/plugin/CMakeLists.txt @@ -24,6 +24,10 @@ target_sources(simplestyleplugin PRIVATE simplestyle.cpp simplestyle.h simplestyleplugin.cpp simplestyleplugin.h ) +set_target_properties(simplestyleplugin PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(simplestyleplugin PUBLIC Qt::Core Qt::Gui diff --git a/examples/widgets/tools/styleplugin/stylewindow/CMakeLists.txt b/examples/widgets/tools/styleplugin/stylewindow/CMakeLists.txt index d018ec0207..5d692b0564 100644 --- a/examples/widgets/tools/styleplugin/stylewindow/CMakeLists.txt +++ b/examples/widgets/tools/styleplugin/stylewindow/CMakeLists.txt @@ -23,6 +23,10 @@ qt_add_executable(styleplugin main.cpp stylewindow.cpp stylewindow.h ) +set_target_properties(styleplugin PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(styleplugin PUBLIC Qt::Core Qt::Gui diff --git a/examples/widgets/tools/treemodelcompleter/CMakeLists.txt b/examples/widgets/tools/treemodelcompleter/CMakeLists.txt index 7cefcd5ea5..34d1d996ed 100644 --- a/examples/widgets/tools/treemodelcompleter/CMakeLists.txt +++ b/examples/widgets/tools/treemodelcompleter/CMakeLists.txt @@ -24,6 +24,10 @@ qt_add_executable(treemodelcompleter mainwindow.cpp mainwindow.h treemodelcompleter.cpp treemodelcompleter.h ) +set_target_properties(treemodelcompleter PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(treemodelcompleter PUBLIC Qt::Core Qt::Gui diff --git a/examples/widgets/tools/undo/CMakeLists.txt b/examples/widgets/tools/undo/CMakeLists.txt index 70e38a8866..8156e12bcd 100644 --- a/examples/widgets/tools/undo/CMakeLists.txt +++ b/examples/widgets/tools/undo/CMakeLists.txt @@ -25,6 +25,10 @@ qt_add_executable(undo main.cpp mainwindow.cpp mainwindow.h mainwindow.ui ) +set_target_properties(undo PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(undo PUBLIC Qt::Core Qt::Gui diff --git a/examples/widgets/tools/undoframework/CMakeLists.txt b/examples/widgets/tools/undoframework/CMakeLists.txt index a4a91ae7c4..9286f83ddb 100644 --- a/examples/widgets/tools/undoframework/CMakeLists.txt +++ b/examples/widgets/tools/undoframework/CMakeLists.txt @@ -26,6 +26,10 @@ qt_add_executable(undoframework main.cpp mainwindow.cpp mainwindow.h ) +set_target_properties(undoframework PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) target_link_libraries(undoframework PUBLIC Qt::Core Qt::Gui -- cgit v1.2.3