From e1dd0056073934ceb75002b7516ffc277c01355c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Wed, 15 Dec 2021 16:27:37 +0100 Subject: [PATCH] Examples: Clean up WIN32_EXECUTABLE, MACOSX_BUNDLE properties MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Both are FALSE by default, so no point in explicitly setting them to FALSE. In addition, dbus/listnames is a command line tool. No reason to set WIN32_EXECUTABLE, MACOSX_BUNDLE here. Change-Id: I99aaf27a0267c5575bd2ee5b6183991fce721f44 Reviewed-by: Tor Arne Vestbø (cherry picked from commit 131681652eb609a19eac963222c553442138ae12) Reviewed-by: Qt Cherry-pick Bot --- .../corelib/serialization/cbordump/CMakeLists.txt | 5 ----- examples/corelib/serialization/convert/CMakeLists.txt | 5 ----- .../corelib/serialization/savegame/CMakeLists.txt | 5 ----- examples/corelib/threads/semaphores/CMakeLists.txt | 5 ----- .../corelib/threads/waitconditions/CMakeLists.txt | 5 ----- examples/dbus/listnames/CMakeLists.txt | 11 ----------- examples/network/dnslookup/CMakeLists.txt | 5 ----- examples/network/download/CMakeLists.txt | 5 ----- examples/network/downloadmanager/CMakeLists.txt | 5 ----- examples/qtconcurrent/map/CMakeLists.txt | 5 ----- examples/qtconcurrent/runfunction/CMakeLists.txt | 5 ----- examples/qtconcurrent/wordcount/CMakeLists.txt | 5 ----- 12 files changed, 66 deletions(-) diff --git a/examples/corelib/serialization/cbordump/CMakeLists.txt b/examples/corelib/serialization/cbordump/CMakeLists.txt index 046447995d1..6c277b9c375 100644 --- a/examples/corelib/serialization/cbordump/CMakeLists.txt +++ b/examples/corelib/serialization/cbordump/CMakeLists.txt @@ -19,11 +19,6 @@ qt_add_executable(cbordump main.cpp ) -set_target_properties(cbordump PROPERTIES - WIN32_EXECUTABLE FALSE - MACOSX_BUNDLE FALSE -) - target_link_libraries(cbordump PUBLIC Qt::Core ) diff --git a/examples/corelib/serialization/convert/CMakeLists.txt b/examples/corelib/serialization/convert/CMakeLists.txt index 55e016aedfa..a9275f2e16e 100644 --- a/examples/corelib/serialization/convert/CMakeLists.txt +++ b/examples/corelib/serialization/convert/CMakeLists.txt @@ -26,11 +26,6 @@ qt_add_executable(convert xmlconverter.cpp xmlconverter.h ) -set_target_properties(convert PROPERTIES - WIN32_EXECUTABLE FALSE - MACOSX_BUNDLE FALSE -) - target_link_libraries(convert PUBLIC Qt::Core ) diff --git a/examples/corelib/serialization/savegame/CMakeLists.txt b/examples/corelib/serialization/savegame/CMakeLists.txt index 3ffc3c97d36..31b85c108c9 100644 --- a/examples/corelib/serialization/savegame/CMakeLists.txt +++ b/examples/corelib/serialization/savegame/CMakeLists.txt @@ -22,11 +22,6 @@ qt_add_executable(savegame main.cpp ) -set_target_properties(savegame PROPERTIES - WIN32_EXECUTABLE FALSE - MACOSX_BUNDLE FALSE -) - target_link_libraries(savegame PUBLIC Qt::Core ) diff --git a/examples/corelib/threads/semaphores/CMakeLists.txt b/examples/corelib/threads/semaphores/CMakeLists.txt index f5206dabc9e..d424759d7e9 100644 --- a/examples/corelib/threads/semaphores/CMakeLists.txt +++ b/examples/corelib/threads/semaphores/CMakeLists.txt @@ -19,11 +19,6 @@ qt_add_executable(semaphores semaphores.cpp ) -set_target_properties(semaphores PROPERTIES - WIN32_EXECUTABLE FALSE - MACOSX_BUNDLE FALSE -) - target_link_libraries(semaphores PUBLIC Qt::Core ) diff --git a/examples/corelib/threads/waitconditions/CMakeLists.txt b/examples/corelib/threads/waitconditions/CMakeLists.txt index 8b9a24d5842..1977cf7c41d 100644 --- a/examples/corelib/threads/waitconditions/CMakeLists.txt +++ b/examples/corelib/threads/waitconditions/CMakeLists.txt @@ -19,11 +19,6 @@ qt_add_executable(waitconditions waitconditions.cpp ) -set_target_properties(waitconditions PROPERTIES - WIN32_EXECUTABLE FALSE - MACOSX_BUNDLE FALSE -) - target_link_libraries(waitconditions PUBLIC Qt::Core ) diff --git a/examples/dbus/listnames/CMakeLists.txt b/examples/dbus/listnames/CMakeLists.txt index fd18051484d..784a2c5dd4a 100644 --- a/examples/dbus/listnames/CMakeLists.txt +++ b/examples/dbus/listnames/CMakeLists.txt @@ -19,22 +19,11 @@ qt_add_executable(listnames listnames.cpp ) -set_target_properties(listnames PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) - target_link_libraries(listnames PUBLIC Qt::Core Qt::DBus ) -if(WIN32) - set_target_properties(listnames PROPERTIES - WIN32_EXECUTABLE FALSE - ) -endif() - install(TARGETS listnames RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/network/dnslookup/CMakeLists.txt b/examples/network/dnslookup/CMakeLists.txt index 303d042aa56..dbdf1e6b4cd 100644 --- a/examples/network/dnslookup/CMakeLists.txt +++ b/examples/network/dnslookup/CMakeLists.txt @@ -19,11 +19,6 @@ qt_add_executable(dnslookup dnslookup.cpp dnslookup.h ) -set_target_properties(dnslookup PROPERTIES - WIN32_EXECUTABLE FALSE - MACOSX_BUNDLE FALSE -) - target_link_libraries(dnslookup PUBLIC Qt::Core Qt::Network diff --git a/examples/network/download/CMakeLists.txt b/examples/network/download/CMakeLists.txt index 62db5c910f0..0c1f234c2a7 100644 --- a/examples/network/download/CMakeLists.txt +++ b/examples/network/download/CMakeLists.txt @@ -19,11 +19,6 @@ qt_add_executable(download main.cpp ) -set_target_properties(download PROPERTIES - WIN32_EXECUTABLE FALSE - MACOSX_BUNDLE FALSE -) - target_link_libraries(download PUBLIC Qt::Core Qt::Network diff --git a/examples/network/downloadmanager/CMakeLists.txt b/examples/network/downloadmanager/CMakeLists.txt index d268749e576..1cb564dc42f 100644 --- a/examples/network/downloadmanager/CMakeLists.txt +++ b/examples/network/downloadmanager/CMakeLists.txt @@ -21,11 +21,6 @@ qt_add_executable(downloadmanager textprogressbar.cpp textprogressbar.h ) -set_target_properties(downloadmanager PROPERTIES - WIN32_EXECUTABLE FALSE - MACOSX_BUNDLE FALSE -) - target_link_libraries(downloadmanager PUBLIC Qt::Core Qt::Network diff --git a/examples/qtconcurrent/map/CMakeLists.txt b/examples/qtconcurrent/map/CMakeLists.txt index e767a3067c8..ca49eb0fd9f 100644 --- a/examples/qtconcurrent/map/CMakeLists.txt +++ b/examples/qtconcurrent/map/CMakeLists.txt @@ -19,11 +19,6 @@ qt_add_executable(mapdemo main.cpp ) -set_target_properties(mapdemo PROPERTIES - WIN32_EXECUTABLE FALSE - MACOSX_BUNDLE FALSE -) - target_link_libraries(mapdemo PUBLIC Qt::Concurrent Qt::Core diff --git a/examples/qtconcurrent/runfunction/CMakeLists.txt b/examples/qtconcurrent/runfunction/CMakeLists.txt index a6e3684f39e..0f80b41b4db 100644 --- a/examples/qtconcurrent/runfunction/CMakeLists.txt +++ b/examples/qtconcurrent/runfunction/CMakeLists.txt @@ -19,11 +19,6 @@ qt_add_executable(runfunction main.cpp ) -set_target_properties(runfunction PROPERTIES - WIN32_EXECUTABLE FALSE - MACOSX_BUNDLE FALSE -) - target_link_libraries(runfunction PUBLIC Qt::Concurrent Qt::Core diff --git a/examples/qtconcurrent/wordcount/CMakeLists.txt b/examples/qtconcurrent/wordcount/CMakeLists.txt index 9a4f4344c68..4fdacf5348b 100644 --- a/examples/qtconcurrent/wordcount/CMakeLists.txt +++ b/examples/qtconcurrent/wordcount/CMakeLists.txt @@ -19,11 +19,6 @@ qt_add_executable(wordcount main.cpp ) -set_target_properties(wordcount PROPERTIES - WIN32_EXECUTABLE FALSE - MACOSX_BUNDLE FALSE -) - target_link_libraries(wordcount PUBLIC Qt::Concurrent Qt::Core