From efa9998521cb061051fe8b75d0df3206d0b32ec5 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 12 Jun 2019 10:21:40 +0200 Subject: Fix compiling of examples on Android * Simplify add_qt_gui_executable() to not require WIN32/MACOSX_BUNDLE but provide it implicitly. It's redundant :) * When on Android, build a module (shared library), just like qmake. This requires an additional library destination in the install() call, but that's ignored on other platforms. * Fix typos in the android deployment generation settings function * Use the correct cache variable to determine whether we're inside a Qt build or not. Right now this only works inside Qt builds anyway as QtPlatformAndroid.cmake is not publically accessible. Change-Id: If1c763c31a7a83d0e0d854362ba7901657f63eb5 Reviewed-by: Alexandru Croitor Reviewed-by: Qt CMake Build Bot --- examples/widgets/animation/animatedtiles/CMakeLists.txt | 3 ++- examples/widgets/animation/easing/CMakeLists.txt | 3 ++- examples/widgets/animation/moveblocks/CMakeLists.txt | 3 ++- examples/widgets/animation/states/CMakeLists.txt | 3 ++- examples/widgets/animation/stickman/CMakeLists.txt | 3 ++- examples/widgets/animation/sub-attaq/CMakeLists.txt | 3 ++- examples/widgets/desktop/screenshot/CMakeLists.txt | 3 ++- examples/widgets/desktop/systray/CMakeLists.txt | 3 ++- examples/widgets/dialogs/classwizard/CMakeLists.txt | 3 ++- examples/widgets/dialogs/extension/CMakeLists.txt | 3 ++- examples/widgets/dialogs/findfiles/CMakeLists.txt | 3 ++- examples/widgets/dialogs/licensewizard/CMakeLists.txt | 3 ++- examples/widgets/dialogs/standarddialogs/CMakeLists.txt | 3 ++- examples/widgets/dialogs/tabdialog/CMakeLists.txt | 3 ++- examples/widgets/dialogs/trivialwizard/CMakeLists.txt | 3 ++- examples/widgets/draganddrop/draggableicons/CMakeLists.txt | 3 ++- examples/widgets/draganddrop/draggabletext/CMakeLists.txt | 3 ++- examples/widgets/draganddrop/dropsite/CMakeLists.txt | 3 ++- examples/widgets/draganddrop/fridgemagnets/CMakeLists.txt | 3 ++- examples/widgets/draganddrop/puzzle/CMakeLists.txt | 3 ++- examples/widgets/effects/blurpicker/CMakeLists.txt | 3 ++- examples/widgets/effects/fademessage/CMakeLists.txt | 3 ++- examples/widgets/gestures/imagegestures/CMakeLists.txt | 3 ++- examples/widgets/graphicsview/anchorlayout/CMakeLists.txt | 3 ++- examples/widgets/graphicsview/basicgraphicslayouts/CMakeLists.txt | 3 ++- examples/widgets/graphicsview/boxes/CMakeLists.txt | 3 ++- examples/widgets/graphicsview/chip/CMakeLists.txt | 3 ++- examples/widgets/graphicsview/collidingmice/CMakeLists.txt | 3 ++- examples/widgets/graphicsview/diagramscene/CMakeLists.txt | 3 ++- examples/widgets/graphicsview/dragdroprobot/CMakeLists.txt | 3 ++- examples/widgets/graphicsview/elasticnodes/CMakeLists.txt | 3 ++- examples/widgets/graphicsview/embeddeddialogs/CMakeLists.txt | 3 ++- examples/widgets/graphicsview/flowlayout/CMakeLists.txt | 3 ++- examples/widgets/graphicsview/padnavigator/CMakeLists.txt | 1 + examples/widgets/graphicsview/simpleanchorlayout/CMakeLists.txt | 3 ++- examples/widgets/graphicsview/weatheranchorlayout/CMakeLists.txt | 3 ++- examples/widgets/itemviews/addressbook/CMakeLists.txt | 3 ++- examples/widgets/itemviews/basicsortfiltermodel/CMakeLists.txt | 3 ++- examples/widgets/itemviews/chart/CMakeLists.txt | 3 ++- examples/widgets/itemviews/coloreditorfactory/CMakeLists.txt | 3 ++- examples/widgets/itemviews/combowidgetmapper/CMakeLists.txt | 3 ++- examples/widgets/itemviews/customsortfiltermodel/CMakeLists.txt | 3 ++- examples/widgets/itemviews/dirview/CMakeLists.txt | 3 ++- examples/widgets/itemviews/editabletreemodel/CMakeLists.txt | 3 ++- examples/widgets/itemviews/fetchmore/CMakeLists.txt | 3 ++- examples/widgets/itemviews/flattreeview/CMakeLists.txt | 3 ++- examples/widgets/itemviews/frozencolumn/CMakeLists.txt | 3 ++- examples/widgets/itemviews/interview/CMakeLists.txt | 3 ++- examples/widgets/itemviews/pixelator/CMakeLists.txt | 3 ++- examples/widgets/itemviews/puzzle/CMakeLists.txt | 3 ++- examples/widgets/itemviews/simpledommodel/CMakeLists.txt | 3 ++- examples/widgets/itemviews/simpletreemodel/CMakeLists.txt | 3 ++- examples/widgets/itemviews/simplewidgetmapper/CMakeLists.txt | 3 ++- examples/widgets/itemviews/spinboxdelegate/CMakeLists.txt | 3 ++- examples/widgets/itemviews/spreadsheet/CMakeLists.txt | 3 ++- examples/widgets/itemviews/stardelegate/CMakeLists.txt | 3 ++- examples/widgets/itemviews/storageview/CMakeLists.txt | 3 ++- examples/widgets/layouts/basiclayouts/CMakeLists.txt | 3 ++- examples/widgets/layouts/borderlayout/CMakeLists.txt | 3 ++- examples/widgets/layouts/dynamiclayouts/CMakeLists.txt | 3 ++- examples/widgets/layouts/flowlayout/CMakeLists.txt | 3 ++- examples/widgets/mac/qmaccocoaviewcontainer/CMakeLists.txt | 3 ++- examples/widgets/mac/qmacnativewidget/CMakeLists.txt | 3 ++- examples/widgets/mainwindows/application/CMakeLists.txt | 3 ++- examples/widgets/mainwindows/dockwidgets/CMakeLists.txt | 3 ++- examples/widgets/mainwindows/mainwindow/CMakeLists.txt | 3 ++- examples/widgets/mainwindows/mdi/CMakeLists.txt | 3 ++- examples/widgets/mainwindows/menus/CMakeLists.txt | 3 ++- examples/widgets/mainwindows/sdi/CMakeLists.txt | 3 ++- examples/widgets/painting/affine/CMakeLists.txt | 3 ++- examples/widgets/painting/basicdrawing/CMakeLists.txt | 3 ++- examples/widgets/painting/composition/CMakeLists.txt | 3 ++- examples/widgets/painting/concentriccircles/CMakeLists.txt | 3 ++- examples/widgets/painting/deform/CMakeLists.txt | 3 ++- examples/widgets/painting/fontsampler/CMakeLists.txt | 3 ++- examples/widgets/painting/gradients/CMakeLists.txt | 3 ++- examples/widgets/painting/imagecomposition/CMakeLists.txt | 3 ++- examples/widgets/painting/painterpaths/CMakeLists.txt | 3 ++- examples/widgets/painting/pathstroke/CMakeLists.txt | 3 ++- examples/widgets/painting/transformations/CMakeLists.txt | 3 ++- examples/widgets/richtext/calendar/CMakeLists.txt | 3 ++- examples/widgets/richtext/orderform/CMakeLists.txt | 3 ++- examples/widgets/richtext/syntaxhighlighter/CMakeLists.txt | 3 ++- examples/widgets/richtext/textedit/CMakeLists.txt | 3 ++- examples/widgets/scroller/graphicsview/CMakeLists.txt | 3 ++- examples/widgets/statemachine/eventtransitions/CMakeLists.txt | 3 ++- examples/widgets/statemachine/factorial/CMakeLists.txt | 1 + examples/widgets/statemachine/pingpong/CMakeLists.txt | 1 + examples/widgets/statemachine/rogue/CMakeLists.txt | 3 ++- examples/widgets/statemachine/trafficlight/CMakeLists.txt | 3 ++- examples/widgets/statemachine/twowaybutton/CMakeLists.txt | 3 ++- examples/widgets/tools/codecs/CMakeLists.txt | 3 ++- examples/widgets/tools/completer/CMakeLists.txt | 3 ++- examples/widgets/tools/customcompleter/CMakeLists.txt | 3 ++- examples/widgets/tools/echoplugin/echowindow/CMakeLists.txt | 3 ++- examples/widgets/tools/i18n/CMakeLists.txt | 3 ++- examples/widgets/tools/plugandpaint/app/CMakeLists.txt | 3 ++- examples/widgets/tools/regexp/CMakeLists.txt | 3 ++- examples/widgets/tools/regularexpression/CMakeLists.txt | 3 ++- examples/widgets/tools/settingseditor/CMakeLists.txt | 3 ++- examples/widgets/tools/styleplugin/stylewindow/CMakeLists.txt | 3 ++- examples/widgets/tools/treemodelcompleter/CMakeLists.txt | 3 ++- examples/widgets/tools/undo/CMakeLists.txt | 3 ++- examples/widgets/tools/undoframework/CMakeLists.txt | 3 ++- examples/widgets/touch/dials/CMakeLists.txt | 3 ++- examples/widgets/touch/fingerpaint/CMakeLists.txt | 3 ++- examples/widgets/touch/knobs/CMakeLists.txt | 3 ++- examples/widgets/touch/pinchzoom/CMakeLists.txt | 3 ++- examples/widgets/tutorials/addressbook/part1/CMakeLists.txt | 3 ++- examples/widgets/tutorials/addressbook/part2/CMakeLists.txt | 3 ++- examples/widgets/tutorials/addressbook/part3/CMakeLists.txt | 3 ++- examples/widgets/tutorials/addressbook/part4/CMakeLists.txt | 3 ++- examples/widgets/tutorials/addressbook/part5/CMakeLists.txt | 3 ++- examples/widgets/tutorials/addressbook/part6/CMakeLists.txt | 3 ++- examples/widgets/tutorials/addressbook/part7/CMakeLists.txt | 3 ++- examples/widgets/tutorials/gettingStarted/gsQt/part1/CMakeLists.txt | 3 ++- examples/widgets/tutorials/gettingStarted/gsQt/part2/CMakeLists.txt | 3 ++- examples/widgets/tutorials/gettingStarted/gsQt/part3/CMakeLists.txt | 3 ++- examples/widgets/tutorials/gettingStarted/gsQt/part4/CMakeLists.txt | 3 ++- examples/widgets/tutorials/gettingStarted/gsQt/part5/CMakeLists.txt | 3 ++- examples/widgets/tutorials/modelview/1_readonly/CMakeLists.txt | 3 ++- examples/widgets/tutorials/modelview/2_formatting/CMakeLists.txt | 3 ++- examples/widgets/tutorials/modelview/3_changingmodel/CMakeLists.txt | 3 ++- examples/widgets/tutorials/modelview/4_headers/CMakeLists.txt | 3 ++- examples/widgets/tutorials/modelview/5_edit/CMakeLists.txt | 3 ++- examples/widgets/tutorials/modelview/6_treeview/CMakeLists.txt | 3 ++- examples/widgets/tutorials/modelview/7_selections/CMakeLists.txt | 3 ++- examples/widgets/tutorials/notepad/CMakeLists.txt | 3 ++- examples/widgets/tutorials/widgets/childwidget/CMakeLists.txt | 3 ++- examples/widgets/tutorials/widgets/nestedlayouts/CMakeLists.txt | 3 ++- examples/widgets/tutorials/widgets/toplevel/CMakeLists.txt | 3 ++- examples/widgets/tutorials/widgets/windowlayout/CMakeLists.txt | 3 ++- examples/widgets/widgets/analogclock/CMakeLists.txt | 3 ++- examples/widgets/widgets/calculator/CMakeLists.txt | 3 ++- examples/widgets/widgets/calendarwidget/CMakeLists.txt | 3 ++- examples/widgets/widgets/charactermap/CMakeLists.txt | 3 ++- examples/widgets/widgets/codeeditor/CMakeLists.txt | 3 ++- examples/widgets/widgets/digitalclock/CMakeLists.txt | 3 ++- examples/widgets/widgets/elidedlabel/CMakeLists.txt | 3 ++- examples/widgets/widgets/groupbox/CMakeLists.txt | 3 ++- examples/widgets/widgets/icons/CMakeLists.txt | 3 ++- examples/widgets/widgets/imageviewer/CMakeLists.txt | 3 ++- examples/widgets/widgets/lineedits/CMakeLists.txt | 3 ++- examples/widgets/widgets/mousebuttons/CMakeLists.txt | 3 ++- examples/widgets/widgets/movie/CMakeLists.txt | 3 ++- examples/widgets/widgets/scribble/CMakeLists.txt | 3 ++- examples/widgets/widgets/shapedclock/CMakeLists.txt | 3 ++- examples/widgets/widgets/sliders/CMakeLists.txt | 3 ++- examples/widgets/widgets/spinboxes/CMakeLists.txt | 3 ++- examples/widgets/widgets/styles/CMakeLists.txt | 3 ++- examples/widgets/widgets/stylesheet/CMakeLists.txt | 3 ++- examples/widgets/widgets/tablet/CMakeLists.txt | 3 ++- examples/widgets/widgets/tetrix/CMakeLists.txt | 3 ++- examples/widgets/widgets/tooltips/CMakeLists.txt | 3 ++- examples/widgets/widgets/validators/CMakeLists.txt | 3 ++- examples/widgets/widgets/wiggly/CMakeLists.txt | 3 ++- examples/widgets/widgets/windowflags/CMakeLists.txt | 3 ++- examples/widgets/windowcontainer/CMakeLists.txt | 3 ++- 158 files changed, 313 insertions(+), 155 deletions(-) (limited to 'examples/widgets') diff --git a/examples/widgets/animation/animatedtiles/CMakeLists.txt b/examples/widgets/animation/animatedtiles/CMakeLists.txt index e3fa88aebb..ea48cf56a3 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_qt_gui_executable(animatedtiles WIN32 MACOSX_BUNDLE +add_qt_gui_executable(animatedtiles animatedtiles.qrc main.cpp ) @@ -24,4 +24,5 @@ target_link_libraries(animatedtiles PUBLIC install(TARGETS animatedtiles RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/animation/easing/CMakeLists.txt b/examples/widgets/animation/easing/CMakeLists.txt index 441b27b0c4..840e4e59ab 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_qt_gui_executable(easing WIN32 MACOSX_BUNDLE +add_qt_gui_executable(easing animation.h easing.qrc form.ui @@ -27,4 +27,5 @@ target_link_libraries(easing PUBLIC install(TARGETS easing RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/animation/moveblocks/CMakeLists.txt b/examples/widgets/animation/moveblocks/CMakeLists.txt index 971bf2e7e5..6f8aa9ceff 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_qt_gui_executable(moveblocks WIN32 MACOSX_BUNDLE +add_qt_gui_executable(moveblocks main.cpp ) target_link_libraries(moveblocks PUBLIC @@ -23,4 +23,5 @@ target_link_libraries(moveblocks PUBLIC install(TARGETS moveblocks RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/animation/states/CMakeLists.txt b/examples/widgets/animation/states/CMakeLists.txt index bd353422d2..5974f28de8 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_qt_gui_executable(states WIN32 MACOSX_BUNDLE +add_qt_gui_executable(states main.cpp states.qrc ) @@ -24,4 +24,5 @@ target_link_libraries(states PUBLIC install(TARGETS states RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/animation/stickman/CMakeLists.txt b/examples/widgets/animation/stickman/CMakeLists.txt index 90bc09e5d7..62a35ed796 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_qt_gui_executable(stickman WIN32 MACOSX_BUNDLE +add_qt_gui_executable(stickman animation.cpp animation.h graphicsview.cpp graphicsview.h lifecycle.cpp lifecycle.h @@ -29,4 +29,5 @@ target_link_libraries(stickman PUBLIC install(TARGETS stickman RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/animation/sub-attaq/CMakeLists.txt b/examples/widgets/animation/sub-attaq/CMakeLists.txt index 883c1cd0c5..969a24c1da 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_qt_gui_executable(sub-attaq WIN32 MACOSX_BUNDLE +add_qt_gui_executable(sub-attaq animationmanager.cpp animationmanager.h boat.cpp boat.h boat_p.h bomb.cpp bomb.h @@ -40,4 +40,5 @@ endif() install(TARGETS sub-attaq RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/desktop/screenshot/CMakeLists.txt b/examples/widgets/desktop/screenshot/CMakeLists.txt index 4c207f1bef..494515029d 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_qt_gui_executable(screenshot WIN32 MACOSX_BUNDLE +add_qt_gui_executable(screenshot main.cpp screenshot.cpp screenshot.h ) @@ -24,4 +24,5 @@ target_link_libraries(screenshot PUBLIC install(TARGETS screenshot RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/desktop/systray/CMakeLists.txt b/examples/widgets/desktop/systray/CMakeLists.txt index 754ccad8e3..cd47d5d833 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_qt_gui_executable(systray WIN32 MACOSX_BUNDLE +add_qt_gui_executable(systray main.cpp systray.qrc window.cpp window.h @@ -25,4 +25,5 @@ target_link_libraries(systray PUBLIC install(TARGETS systray RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/dialogs/classwizard/CMakeLists.txt b/examples/widgets/dialogs/classwizard/CMakeLists.txt index 5a57c5905a..1f763111d5 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_qt_gui_executable(classwizard WIN32 MACOSX_BUNDLE +add_qt_gui_executable(classwizard classwizard.cpp classwizard.h classwizard.qrc main.cpp ) @@ -24,4 +24,5 @@ target_link_libraries(classwizard PUBLIC install(TARGETS classwizard RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/dialogs/extension/CMakeLists.txt b/examples/widgets/dialogs/extension/CMakeLists.txt index fa35d52048..f21fddf722 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_qt_gui_executable(extension WIN32 MACOSX_BUNDLE +add_qt_gui_executable(extension finddialog.cpp finddialog.h main.cpp ) @@ -24,4 +24,5 @@ target_link_libraries(extension PUBLIC install(TARGETS extension RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/dialogs/findfiles/CMakeLists.txt b/examples/widgets/dialogs/findfiles/CMakeLists.txt index 12ce6ce05e..9865d67076 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_qt_gui_executable(findfiles WIN32 MACOSX_BUNDLE +add_qt_gui_executable(findfiles main.cpp window.cpp window.h ) @@ -24,4 +24,5 @@ target_link_libraries(findfiles PUBLIC install(TARGETS findfiles RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/dialogs/licensewizard/CMakeLists.txt b/examples/widgets/dialogs/licensewizard/CMakeLists.txt index a82800363e..b09c1a4802 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_qt_gui_executable(licensewizard WIN32 MACOSX_BUNDLE +add_qt_gui_executable(licensewizard licensewizard.cpp licensewizard.h licensewizard.qrc main.cpp ) @@ -26,4 +26,5 @@ target_link_libraries(licensewizard PUBLIC install(TARGETS licensewizard RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/dialogs/standarddialogs/CMakeLists.txt b/examples/widgets/dialogs/standarddialogs/CMakeLists.txt index 91c74b71e1..0cce717924 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_qt_gui_executable(standarddialogs WIN32 MACOSX_BUNDLE +add_qt_gui_executable(standarddialogs dialog.cpp dialog.h main.cpp ) @@ -24,4 +24,5 @@ target_link_libraries(standarddialogs PUBLIC install(TARGETS standarddialogs RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/dialogs/tabdialog/CMakeLists.txt b/examples/widgets/dialogs/tabdialog/CMakeLists.txt index ec88fd66d0..50d6209cb8 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_qt_gui_executable(tabdialog WIN32 MACOSX_BUNDLE +add_qt_gui_executable(tabdialog main.cpp tabdialog.cpp tabdialog.h ) @@ -24,4 +24,5 @@ target_link_libraries(tabdialog PUBLIC install(TARGETS tabdialog RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/dialogs/trivialwizard/CMakeLists.txt b/examples/widgets/dialogs/trivialwizard/CMakeLists.txt index 394816619d..a8601f02ec 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_qt_gui_executable(trivialwizard WIN32 MACOSX_BUNDLE +add_qt_gui_executable(trivialwizard trivialwizard.cpp ) target_link_libraries(trivialwizard PUBLIC @@ -23,4 +23,5 @@ target_link_libraries(trivialwizard PUBLIC install(TARGETS trivialwizard RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/draganddrop/draggableicons/CMakeLists.txt b/examples/widgets/draganddrop/draggableicons/CMakeLists.txt index d7ec690a98..a8fbaa17ed 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_qt_gui_executable(draggableicons WIN32 MACOSX_BUNDLE +add_qt_gui_executable(draggableicons draggableicons.qrc dragwidget.cpp dragwidget.h main.cpp @@ -25,4 +25,5 @@ target_link_libraries(draggableicons PUBLIC install(TARGETS draggableicons RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/draganddrop/draggabletext/CMakeLists.txt b/examples/widgets/draganddrop/draggabletext/CMakeLists.txt index c145771015..9a0c6addc9 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_qt_gui_executable(draggabletext WIN32 MACOSX_BUNDLE +add_qt_gui_executable(draggabletext draggabletext.qrc dragwidget.cpp dragwidget.h main.cpp @@ -25,4 +25,5 @@ target_link_libraries(draggabletext PUBLIC install(TARGETS draggabletext RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/draganddrop/dropsite/CMakeLists.txt b/examples/widgets/draganddrop/dropsite/CMakeLists.txt index 863a757f39..5b6e5be435 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_qt_gui_executable(dropsite WIN32 MACOSX_BUNDLE +add_qt_gui_executable(dropsite droparea.cpp droparea.h dropsitewindow.cpp dropsitewindow.h main.cpp @@ -25,4 +25,5 @@ target_link_libraries(dropsite PUBLIC install(TARGETS dropsite RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/draganddrop/fridgemagnets/CMakeLists.txt b/examples/widgets/draganddrop/fridgemagnets/CMakeLists.txt index d7acb41b21..e1888ab59c 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_qt_gui_executable(fridgemagnets WIN32 MACOSX_BUNDLE +add_qt_gui_executable(fridgemagnets draglabel.cpp draglabel.h dragwidget.cpp dragwidget.h fridgemagnets.qrc @@ -26,4 +26,5 @@ target_link_libraries(fridgemagnets PUBLIC install(TARGETS fridgemagnets RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/draganddrop/puzzle/CMakeLists.txt b/examples/widgets/draganddrop/puzzle/CMakeLists.txt index 4419101117..267aa6fbe7 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_qt_gui_executable(draganddrop_puzzle WIN32 MACOSX_BUNDLE # special case: renamed puzzle +add_qt_gui_executable(draganddrop_puzzle # special case: renamed puzzle main.cpp mainwindow.cpp mainwindow.h pieceslist.cpp pieceslist.h @@ -27,4 +27,5 @@ target_link_libraries(draganddrop_puzzle PUBLIC # special case: renamed puzzle install(TARGETS draganddrop_puzzle # special case: renamed puzzle RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/effects/blurpicker/CMakeLists.txt b/examples/widgets/effects/blurpicker/CMakeLists.txt index f5b7047b8a..ddb36841cf 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_qt_gui_executable(blurpicker WIN32 MACOSX_BUNDLE +add_qt_gui_executable(blurpicker blureffect.cpp blureffect.h blurpicker.cpp blurpicker.h blurpicker.qrc main.cpp @@ -25,4 +25,5 @@ target_link_libraries(blurpicker PUBLIC install(TARGETS blurpicker RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/effects/fademessage/CMakeLists.txt b/examples/widgets/effects/fademessage/CMakeLists.txt index e53fc405f7..42c01c00e0 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_qt_gui_executable(fademessage WIN32 MACOSX_BUNDLE +add_qt_gui_executable(fademessage fademessage.cpp fademessage.h fademessage.qrc main.cpp ) @@ -24,4 +24,5 @@ target_link_libraries(fademessage PUBLIC install(TARGETS fademessage RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/gestures/imagegestures/CMakeLists.txt b/examples/widgets/gestures/imagegestures/CMakeLists.txt index 75f2b981b7..5cef59b15e 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_qt_gui_executable(imagegestures WIN32 MACOSX_BUNDLE +add_qt_gui_executable(imagegestures imagewidget.cpp imagewidget.h main.cpp mainwidget.cpp mainwidget.h @@ -25,4 +25,5 @@ target_link_libraries(imagegestures PUBLIC install(TARGETS imagegestures RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/graphicsview/anchorlayout/CMakeLists.txt b/examples/widgets/graphicsview/anchorlayout/CMakeLists.txt index 9676dbbcba..7137e76d9b 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_qt_gui_executable(anchorlayout WIN32 MACOSX_BUNDLE +add_qt_gui_executable(anchorlayout main.cpp ) target_link_libraries(anchorlayout PUBLIC @@ -23,4 +23,5 @@ target_link_libraries(anchorlayout PUBLIC install(TARGETS anchorlayout RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/graphicsview/basicgraphicslayouts/CMakeLists.txt b/examples/widgets/graphicsview/basicgraphicslayouts/CMakeLists.txt index 982fd541c6..afe4475bbf 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_qt_gui_executable(basicgraphicslayouts WIN32 MACOSX_BUNDLE +add_qt_gui_executable(basicgraphicslayouts basicgraphicslayouts.qrc layoutitem.cpp layoutitem.h main.cpp @@ -26,4 +26,5 @@ target_link_libraries(basicgraphicslayouts PUBLIC install(TARGETS basicgraphicslayouts RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/graphicsview/boxes/CMakeLists.txt b/examples/widgets/graphicsview/boxes/CMakeLists.txt index b5441bcfdf..856dfd1716 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_qt_gui_executable(boxes WIN32 MACOSX_BUNDLE +add_qt_gui_executable(boxes 3rdparty/fbm.c 3rdparty/fbm.h boxes.qrc glbuffers.cpp glbuffers.h @@ -35,4 +35,5 @@ target_link_libraries(boxes PUBLIC install(TARGETS boxes RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/graphicsview/chip/CMakeLists.txt b/examples/widgets/graphicsview/chip/CMakeLists.txt index 141645a22c..f02cbacf37 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_qt_gui_executable(chip WIN32 MACOSX_BUNDLE +add_qt_gui_executable(chip chip.cpp chip.h images.qrc main.cpp @@ -35,4 +35,5 @@ endif() install(TARGETS chip RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/graphicsview/collidingmice/CMakeLists.txt b/examples/widgets/graphicsview/collidingmice/CMakeLists.txt index 9001858817..2817710600 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_qt_gui_executable(collidingmice WIN32 MACOSX_BUNDLE +add_qt_gui_executable(collidingmice main.cpp mice.qrc mouse.cpp mouse.h @@ -25,4 +25,5 @@ target_link_libraries(collidingmice PUBLIC install(TARGETS collidingmice RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/graphicsview/diagramscene/CMakeLists.txt b/examples/widgets/graphicsview/diagramscene/CMakeLists.txt index bfdd3b8f5b..b1baf34b2d 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_qt_gui_executable(diagramscene WIN32 MACOSX_BUNDLE +add_qt_gui_executable(diagramscene arrow.cpp arrow.h diagramitem.cpp diagramitem.h diagramscene.cpp diagramscene.h diagramscene.qrc @@ -28,4 +28,5 @@ target_link_libraries(diagramscene PUBLIC install(TARGETS diagramscene RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/graphicsview/dragdroprobot/CMakeLists.txt b/examples/widgets/graphicsview/dragdroprobot/CMakeLists.txt index d85dcd1ff9..df6d2ec4e8 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_qt_gui_executable(dragdroprobot WIN32 MACOSX_BUNDLE +add_qt_gui_executable(dragdroprobot coloritem.cpp coloritem.h main.cpp robot.cpp robot.h robot.qrc @@ -25,4 +25,5 @@ target_link_libraries(dragdroprobot PUBLIC install(TARGETS dragdroprobot RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/graphicsview/elasticnodes/CMakeLists.txt b/examples/widgets/graphicsview/elasticnodes/CMakeLists.txt index b1e04b2a20..5fc7a424b0 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_qt_gui_executable(elasticnodes WIN32 MACOSX_BUNDLE +add_qt_gui_executable(elasticnodes edge.cpp edge.h graphwidget.cpp graphwidget.h main.cpp @@ -26,4 +26,5 @@ target_link_libraries(elasticnodes PUBLIC install(TARGETS elasticnodes RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/graphicsview/embeddeddialogs/CMakeLists.txt b/examples/widgets/graphicsview/embeddeddialogs/CMakeLists.txt index fc9f6086ce..bfa68f15cb 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_qt_gui_executable(embeddeddialogs WIN32 MACOSX_BUNDLE +add_qt_gui_executable(embeddeddialogs customproxy.cpp customproxy.h embeddeddialog.cpp embeddeddialog.h embeddeddialog.ui embeddeddialogs.qrc @@ -26,4 +26,5 @@ target_link_libraries(embeddeddialogs PUBLIC install(TARGETS embeddeddialogs RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/graphicsview/flowlayout/CMakeLists.txt b/examples/widgets/graphicsview/flowlayout/CMakeLists.txt index ef5a4d5564..14b6ea8561 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_qt_gui_executable(graphicsview_flowlayout WIN32 MACOSX_BUNDLE # special case: renamed flowlayout +add_qt_gui_executable(graphicsview_flowlayout # special case: renamed flowlayout flowlayout.cpp flowlayout.h main.cpp window.cpp window.h @@ -25,4 +25,5 @@ target_link_libraries(graphicsview_flowlayout PUBLIC # special case: renamed flo install(TARGETS graphicsview_flowlayout # special case: renamed flowlayout RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/graphicsview/padnavigator/CMakeLists.txt b/examples/widgets/graphicsview/padnavigator/CMakeLists.txt index e995f2a16e..2db8aa1cde 100644 --- a/examples/widgets/graphicsview/padnavigator/CMakeLists.txt +++ b/examples/widgets/graphicsview/padnavigator/CMakeLists.txt @@ -34,4 +34,5 @@ endif() install(TARGETS padnavigator RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/graphicsview/simpleanchorlayout/CMakeLists.txt b/examples/widgets/graphicsview/simpleanchorlayout/CMakeLists.txt index bc1564cb8c..f8def269b6 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_qt_gui_executable(simpleanchorlayout WIN32 MACOSX_BUNDLE +add_qt_gui_executable(simpleanchorlayout main.cpp ) target_link_libraries(simpleanchorlayout PUBLIC @@ -23,4 +23,5 @@ target_link_libraries(simpleanchorlayout PUBLIC install(TARGETS simpleanchorlayout RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/graphicsview/weatheranchorlayout/CMakeLists.txt b/examples/widgets/graphicsview/weatheranchorlayout/CMakeLists.txt index 22e92cc68b..939e6c3fc7 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_qt_gui_executable(weatheranchorlayout WIN32 MACOSX_BUNDLE +add_qt_gui_executable(weatheranchorlayout main.cpp weatheranchorlayout.qrc ) @@ -24,4 +24,5 @@ target_link_libraries(weatheranchorlayout PUBLIC install(TARGETS weatheranchorlayout RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/itemviews/addressbook/CMakeLists.txt b/examples/widgets/itemviews/addressbook/CMakeLists.txt index 2831e860a5..8b0b8c9a9c 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_qt_gui_executable(addressbook WIN32 MACOSX_BUNDLE +add_qt_gui_executable(addressbook adddialog.cpp adddialog.h addresswidget.cpp addresswidget.h main.cpp @@ -28,4 +28,5 @@ target_link_libraries(addressbook PUBLIC install(TARGETS addressbook RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/itemviews/basicsortfiltermodel/CMakeLists.txt b/examples/widgets/itemviews/basicsortfiltermodel/CMakeLists.txt index 8c4d84431e..234ab0eb33 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_qt_gui_executable(basicsortfiltermodel WIN32 MACOSX_BUNDLE +add_qt_gui_executable(basicsortfiltermodel main.cpp window.cpp window.h ) @@ -24,4 +24,5 @@ target_link_libraries(basicsortfiltermodel PUBLIC install(TARGETS basicsortfiltermodel RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/itemviews/chart/CMakeLists.txt b/examples/widgets/itemviews/chart/CMakeLists.txt index 7aceadab54..1032784203 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_qt_gui_executable(chart WIN32 MACOSX_BUNDLE +add_qt_gui_executable(chart chart.qrc main.cpp mainwindow.cpp mainwindow.h @@ -26,4 +26,5 @@ target_link_libraries(chart PUBLIC install(TARGETS chart RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/itemviews/coloreditorfactory/CMakeLists.txt b/examples/widgets/itemviews/coloreditorfactory/CMakeLists.txt index e3cea3e235..d3648bf3e5 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_qt_gui_executable(coloreditorfactory WIN32 MACOSX_BUNDLE +add_qt_gui_executable(coloreditorfactory colorlisteditor.cpp colorlisteditor.h main.cpp window.cpp window.h @@ -25,4 +25,5 @@ target_link_libraries(coloreditorfactory PUBLIC install(TARGETS coloreditorfactory RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/itemviews/combowidgetmapper/CMakeLists.txt b/examples/widgets/itemviews/combowidgetmapper/CMakeLists.txt index 175f78e773..5134666a3a 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_qt_gui_executable(combowidgetmapper WIN32 MACOSX_BUNDLE +add_qt_gui_executable(combowidgetmapper main.cpp window.cpp window.h ) @@ -24,4 +24,5 @@ target_link_libraries(combowidgetmapper PUBLIC install(TARGETS combowidgetmapper RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/itemviews/customsortfiltermodel/CMakeLists.txt b/examples/widgets/itemviews/customsortfiltermodel/CMakeLists.txt index 2c3627657a..2981ea3d45 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_qt_gui_executable(customsortfiltermodel WIN32 MACOSX_BUNDLE +add_qt_gui_executable(customsortfiltermodel customsortfiltermodel.qrc filterwidget.cpp filterwidget.h main.cpp @@ -27,4 +27,5 @@ target_link_libraries(customsortfiltermodel PUBLIC install(TARGETS customsortfiltermodel RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/itemviews/dirview/CMakeLists.txt b/examples/widgets/itemviews/dirview/CMakeLists.txt index 105d420f1a..818fe8323e 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_qt_gui_executable(dirview WIN32 MACOSX_BUNDLE +add_qt_gui_executable(dirview main.cpp ) target_link_libraries(dirview PUBLIC @@ -23,4 +23,5 @@ target_link_libraries(dirview PUBLIC install(TARGETS dirview RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/itemviews/editabletreemodel/CMakeLists.txt b/examples/widgets/itemviews/editabletreemodel/CMakeLists.txt index f3e574c811..d0bc1ea930 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_qt_gui_executable(editabletreemodel WIN32 MACOSX_BUNDLE +add_qt_gui_executable(editabletreemodel editabletreemodel.qrc main.cpp mainwindow.cpp mainwindow.h mainwindow.ui @@ -27,4 +27,5 @@ target_link_libraries(editabletreemodel PUBLIC install(TARGETS editabletreemodel RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/itemviews/fetchmore/CMakeLists.txt b/examples/widgets/itemviews/fetchmore/CMakeLists.txt index be2771970a..3880c61078 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_qt_gui_executable(fetchmore WIN32 MACOSX_BUNDLE +add_qt_gui_executable(fetchmore filelistmodel.cpp filelistmodel.h main.cpp window.cpp window.h @@ -25,4 +25,5 @@ target_link_libraries(fetchmore PUBLIC install(TARGETS fetchmore RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/itemviews/flattreeview/CMakeLists.txt b/examples/widgets/itemviews/flattreeview/CMakeLists.txt index b026b2442f..792287ff32 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_qt_gui_executable(flattreeview WIN32 MACOSX_BUNDLE +add_qt_gui_executable(flattreeview main.cpp ) target_link_libraries(flattreeview PUBLIC @@ -23,4 +23,5 @@ target_link_libraries(flattreeview PUBLIC install(TARGETS flattreeview RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/itemviews/frozencolumn/CMakeLists.txt b/examples/widgets/itemviews/frozencolumn/CMakeLists.txt index fee5570bd6..a075fdc460 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_qt_gui_executable(frozencolumn WIN32 MACOSX_BUNDLE +add_qt_gui_executable(frozencolumn freezetablewidget.cpp freezetablewidget.h grades.qrc main.cpp @@ -25,4 +25,5 @@ target_link_libraries(frozencolumn PUBLIC install(TARGETS frozencolumn RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/itemviews/interview/CMakeLists.txt b/examples/widgets/itemviews/interview/CMakeLists.txt index 76a145c7d8..6da99388d1 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_qt_gui_executable(interview WIN32 MACOSX_BUNDLE +add_qt_gui_executable(interview interview.qrc main.cpp model.cpp model.h @@ -25,4 +25,5 @@ target_link_libraries(interview PUBLIC install(TARGETS interview RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/itemviews/pixelator/CMakeLists.txt b/examples/widgets/itemviews/pixelator/CMakeLists.txt index e3e3388ba9..53f014d39a 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_qt_gui_executable(pixelator WIN32 MACOSX_BUNDLE +add_qt_gui_executable(pixelator imagemodel.cpp imagemodel.h images.qrc main.cpp @@ -33,4 +33,5 @@ endif() install(TARGETS pixelator RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/itemviews/puzzle/CMakeLists.txt b/examples/widgets/itemviews/puzzle/CMakeLists.txt index 77abd09eaf..e54d9dc770 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_qt_gui_executable(itemviews_puzzle WIN32 MACOSX_BUNDLE # special case: renamed puzzle +add_qt_gui_executable(itemviews_puzzle # special case: renamed puzzle main.cpp mainwindow.cpp mainwindow.h piecesmodel.cpp piecesmodel.h @@ -27,4 +27,5 @@ target_link_libraries(itemviews_puzzle PUBLIC # special case: renamed puzzle install(TARGETS itemviews_puzzle # special case: renamed puzzle RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/itemviews/simpledommodel/CMakeLists.txt b/examples/widgets/itemviews/simpledommodel/CMakeLists.txt index 3573eca461..a77e654362 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_qt_gui_executable(simpledommodel WIN32 MACOSX_BUNDLE +add_qt_gui_executable(simpledommodel domitem.cpp domitem.h dommodel.cpp dommodel.h main.cpp @@ -28,4 +28,5 @@ target_link_libraries(simpledommodel PUBLIC install(TARGETS simpledommodel RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/itemviews/simpletreemodel/CMakeLists.txt b/examples/widgets/itemviews/simpletreemodel/CMakeLists.txt index 34c59d55ae..dc3934abfa 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_qt_gui_executable(simpletreemodel WIN32 MACOSX_BUNDLE +add_qt_gui_executable(simpletreemodel main.cpp simpletreemodel.qrc treeitem.cpp treeitem.h @@ -26,4 +26,5 @@ target_link_libraries(simpletreemodel PUBLIC install(TARGETS simpletreemodel RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/itemviews/simplewidgetmapper/CMakeLists.txt b/examples/widgets/itemviews/simplewidgetmapper/CMakeLists.txt index dedf063b5f..69030f6398 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_qt_gui_executable(simplewidgetmapper WIN32 MACOSX_BUNDLE +add_qt_gui_executable(simplewidgetmapper main.cpp window.cpp window.h ) @@ -24,4 +24,5 @@ target_link_libraries(simplewidgetmapper PUBLIC install(TARGETS simplewidgetmapper RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/itemviews/spinboxdelegate/CMakeLists.txt b/examples/widgets/itemviews/spinboxdelegate/CMakeLists.txt index ed2ebc8ab3..333a86faf7 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_qt_gui_executable(spinboxdelegate WIN32 MACOSX_BUNDLE +add_qt_gui_executable(spinboxdelegate delegate.cpp delegate.h main.cpp ) @@ -24,4 +24,5 @@ target_link_libraries(spinboxdelegate PUBLIC install(TARGETS spinboxdelegate RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/itemviews/spreadsheet/CMakeLists.txt b/examples/widgets/itemviews/spreadsheet/CMakeLists.txt index 7e3676e780..5c91eea5e3 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_qt_gui_executable(spreadsheet WIN32 MACOSX_BUNDLE +add_qt_gui_executable(spreadsheet main.cpp printview.cpp printview.h spreadsheet.cpp spreadsheet.h spreadsheet.qrc @@ -33,4 +33,5 @@ endif() install(TARGETS spreadsheet RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/itemviews/stardelegate/CMakeLists.txt b/examples/widgets/itemviews/stardelegate/CMakeLists.txt index 0d3bc684f8..39125cf76f 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_qt_gui_executable(stardelegate WIN32 MACOSX_BUNDLE +add_qt_gui_executable(stardelegate main.cpp stardelegate.cpp stardelegate.h stareditor.cpp stareditor.h @@ -26,4 +26,5 @@ target_link_libraries(stardelegate PUBLIC install(TARGETS stardelegate RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/itemviews/storageview/CMakeLists.txt b/examples/widgets/itemviews/storageview/CMakeLists.txt index b254a217bc..56cb5a1e10 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_qt_gui_executable(storageview WIN32 MACOSX_BUNDLE +add_qt_gui_executable(storageview main.cpp storagemodel.cpp storagemodel.h ) @@ -28,4 +28,5 @@ target_link_libraries(storageview PUBLIC install(TARGETS storageview RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/layouts/basiclayouts/CMakeLists.txt b/examples/widgets/layouts/basiclayouts/CMakeLists.txt index 927cbd7520..374d66bdf4 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_qt_gui_executable(basiclayouts WIN32 MACOSX_BUNDLE +add_qt_gui_executable(basiclayouts dialog.cpp dialog.h main.cpp ) @@ -24,4 +24,5 @@ target_link_libraries(basiclayouts PUBLIC install(TARGETS basiclayouts RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/layouts/borderlayout/CMakeLists.txt b/examples/widgets/layouts/borderlayout/CMakeLists.txt index 74e867f6f1..1cdaa5738f 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_qt_gui_executable(borderlayout WIN32 MACOSX_BUNDLE +add_qt_gui_executable(borderlayout borderlayout.cpp borderlayout.h main.cpp window.cpp window.h @@ -25,4 +25,5 @@ target_link_libraries(borderlayout PUBLIC install(TARGETS borderlayout RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/layouts/dynamiclayouts/CMakeLists.txt b/examples/widgets/layouts/dynamiclayouts/CMakeLists.txt index fad7509823..a10fc71f26 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_qt_gui_executable(dynamiclayouts WIN32 MACOSX_BUNDLE +add_qt_gui_executable(dynamiclayouts dialog.cpp dialog.h main.cpp ) @@ -24,4 +24,5 @@ target_link_libraries(dynamiclayouts PUBLIC install(TARGETS dynamiclayouts RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/layouts/flowlayout/CMakeLists.txt b/examples/widgets/layouts/flowlayout/CMakeLists.txt index b8257d9b4c..56cc086a70 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_qt_gui_executable(flowlayout WIN32 MACOSX_BUNDLE +add_qt_gui_executable(flowlayout flowlayout.cpp flowlayout.h main.cpp window.cpp window.h @@ -25,4 +25,5 @@ target_link_libraries(flowlayout PUBLIC install(TARGETS flowlayout RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/mac/qmaccocoaviewcontainer/CMakeLists.txt b/examples/widgets/mac/qmaccocoaviewcontainer/CMakeLists.txt index 7a29a4cbc5..0f1b48b5c5 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_qt_gui_executable(qmaccocoaviewcontainer WIN32 MACOSX_BUNDLE +add_qt_gui_executable(qmaccocoaviewcontainer main.mm ) target_link_libraries(qmaccocoaviewcontainer PUBLIC @@ -24,4 +24,5 @@ target_link_libraries(qmaccocoaviewcontainer PUBLIC install(TARGETS qmaccocoaviewcontainer RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/mac/qmacnativewidget/CMakeLists.txt b/examples/widgets/mac/qmacnativewidget/CMakeLists.txt index b17b8454b3..38b7d764b1 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_qt_gui_executable(qmacnativewidget WIN32 MACOSX_BUNDLE +add_qt_gui_executable(qmacnativewidget main.mm ) target_link_libraries(qmacnativewidget PUBLIC @@ -24,4 +24,5 @@ target_link_libraries(qmacnativewidget PUBLIC install(TARGETS qmacnativewidget RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/mainwindows/application/CMakeLists.txt b/examples/widgets/mainwindows/application/CMakeLists.txt index 090cac61c7..67b00de33a 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_qt_gui_executable(application WIN32 MACOSX_BUNDLE +add_qt_gui_executable(application application.qrc main.cpp mainwindow.cpp mainwindow.h @@ -25,4 +25,5 @@ target_link_libraries(application PUBLIC install(TARGETS application RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/mainwindows/dockwidgets/CMakeLists.txt b/examples/widgets/mainwindows/dockwidgets/CMakeLists.txt index b3fe472db4..f07fbbcd9b 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_qt_gui_executable(dockwidgets WIN32 MACOSX_BUNDLE +add_qt_gui_executable(dockwidgets dockwidgets.qrc main.cpp mainwindow.cpp mainwindow.h @@ -31,4 +31,5 @@ endif() install(TARGETS dockwidgets RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/mainwindows/mainwindow/CMakeLists.txt b/examples/widgets/mainwindows/mainwindow/CMakeLists.txt index 15824de79c..63fe927e92 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_qt_gui_executable(mainwindow WIN32 MACOSX_BUNDLE +add_qt_gui_executable(mainwindow colorswatch.cpp colorswatch.h main.cpp mainwindow.cpp mainwindow.h mainwindow.qrc @@ -26,4 +26,5 @@ target_link_libraries(mainwindow PUBLIC install(TARGETS mainwindow RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/mainwindows/mdi/CMakeLists.txt b/examples/widgets/mainwindows/mdi/CMakeLists.txt index fda2522b90..806e96ed14 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_qt_gui_executable(mdi WIN32 MACOSX_BUNDLE +add_qt_gui_executable(mdi main.cpp mainwindow.cpp mainwindow.h mdi.qrc @@ -26,4 +26,5 @@ target_link_libraries(mdi PUBLIC install(TARGETS mdi RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/mainwindows/menus/CMakeLists.txt b/examples/widgets/mainwindows/menus/CMakeLists.txt index 1e4d21248e..92c6fd2284 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_qt_gui_executable(menus WIN32 MACOSX_BUNDLE +add_qt_gui_executable(menus main.cpp mainwindow.cpp mainwindow.h ) @@ -24,4 +24,5 @@ target_link_libraries(menus PUBLIC install(TARGETS menus RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/mainwindows/sdi/CMakeLists.txt b/examples/widgets/mainwindows/sdi/CMakeLists.txt index 89c929fc5e..be09a0c240 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_qt_gui_executable(sdi WIN32 MACOSX_BUNDLE +add_qt_gui_executable(sdi main.cpp mainwindow.cpp mainwindow.h sdi.qrc @@ -25,4 +25,5 @@ target_link_libraries(sdi PUBLIC install(TARGETS sdi RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/painting/affine/CMakeLists.txt b/examples/widgets/painting/affine/CMakeLists.txt index 4c8d408e9c..950503d9a7 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_qt_gui_executable(affine WIN32 MACOSX_BUNDLE +add_qt_gui_executable(affine # special case: remove files from ../shared affine.qrc main.cpp @@ -30,4 +30,5 @@ target_link_libraries(affine PUBLIC install(TARGETS affine RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/painting/basicdrawing/CMakeLists.txt b/examples/widgets/painting/basicdrawing/CMakeLists.txt index 112334797f..57a3dd346c 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_qt_gui_executable(basicdrawing WIN32 MACOSX_BUNDLE +add_qt_gui_executable(basicdrawing basicdrawing.qrc main.cpp renderarea.cpp renderarea.h @@ -26,4 +26,5 @@ target_link_libraries(basicdrawing PUBLIC install(TARGETS basicdrawing RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/painting/composition/CMakeLists.txt b/examples/widgets/painting/composition/CMakeLists.txt index 930374270e..48b139edc5 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_qt_gui_executable(composition WIN32 MACOSX_BUNDLE +add_qt_gui_executable(composition # special case: remove files from ../shared composition.cpp composition.h composition.qrc main.cpp @@ -29,4 +29,5 @@ target_link_libraries(composition PUBLIC install(TARGETS composition RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/painting/concentriccircles/CMakeLists.txt b/examples/widgets/painting/concentriccircles/CMakeLists.txt index 6005d5e806..4c26eb1ab3 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_qt_gui_executable(concentriccircles WIN32 MACOSX_BUNDLE +add_qt_gui_executable(concentriccircles circlewidget.cpp circlewidget.h main.cpp window.cpp window.h @@ -25,4 +25,5 @@ target_link_libraries(concentriccircles PUBLIC install(TARGETS concentriccircles RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/painting/deform/CMakeLists.txt b/examples/widgets/painting/deform/CMakeLists.txt index 56e1a2e9d2..8e2fa52d19 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_qt_gui_executable(deform WIN32 MACOSX_BUNDLE +add_qt_gui_executable(deform # special case: remove files from ../shared deform.qrc main.cpp @@ -30,4 +30,5 @@ target_link_libraries(deform PUBLIC install(TARGETS deform RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/painting/fontsampler/CMakeLists.txt b/examples/widgets/painting/fontsampler/CMakeLists.txt index e0be3158f2..ee7ff6b768 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_qt_gui_executable(fontsampler WIN32 MACOSX_BUNDLE +add_qt_gui_executable(fontsampler main.cpp mainwindow.cpp mainwindow.h mainwindowbase.ui @@ -25,4 +25,5 @@ target_link_libraries(fontsampler PUBLIC install(TARGETS fontsampler RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/painting/gradients/CMakeLists.txt b/examples/widgets/painting/gradients/CMakeLists.txt index 69b7fac294..218efc72a3 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_qt_gui_executable(gradients WIN32 MACOSX_BUNDLE +add_qt_gui_executable(gradients # special case: remove files from ../shared gradients.cpp gradients.h gradients.qrc main.cpp @@ -29,4 +29,5 @@ target_link_libraries(gradients PUBLIC install(TARGETS gradients RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/painting/imagecomposition/CMakeLists.txt b/examples/widgets/painting/imagecomposition/CMakeLists.txt index 1fcedbcc9f..4b3e9c78ea 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_qt_gui_executable(imagecomposition WIN32 MACOSX_BUNDLE +add_qt_gui_executable(imagecomposition imagecomposer.cpp imagecomposer.h imagecomposition.qrc main.cpp @@ -25,4 +25,5 @@ target_link_libraries(imagecomposition PUBLIC install(TARGETS imagecomposition RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/painting/painterpaths/CMakeLists.txt b/examples/widgets/painting/painterpaths/CMakeLists.txt index 56007a3e54..14fd70f3d3 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_qt_gui_executable(painterpaths WIN32 MACOSX_BUNDLE +add_qt_gui_executable(painterpaths main.cpp renderarea.cpp renderarea.h window.cpp window.h @@ -25,4 +25,5 @@ target_link_libraries(painterpaths PUBLIC install(TARGETS painterpaths RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/painting/pathstroke/CMakeLists.txt b/examples/widgets/painting/pathstroke/CMakeLists.txt index fac73d2a53..f12ccb0b54 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_qt_gui_executable(pathstroke WIN32 MACOSX_BUNDLE +add_qt_gui_executable(pathstroke ../shared/arthurstyle.cpp ../shared/arthurstyle.h ../shared/arthurwidgets.cpp ../shared/arthurwidgets.h ../shared/hoverpoints.cpp ../shared/hoverpoints.h @@ -31,4 +31,5 @@ target_link_libraries(pathstroke PUBLIC install(TARGETS pathstroke RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/painting/transformations/CMakeLists.txt b/examples/widgets/painting/transformations/CMakeLists.txt index 3218073a96..baa527d857 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_qt_gui_executable(transformations WIN32 MACOSX_BUNDLE +add_qt_gui_executable(transformations main.cpp renderarea.cpp renderarea.h window.cpp window.h @@ -25,4 +25,5 @@ target_link_libraries(transformations PUBLIC install(TARGETS transformations RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/richtext/calendar/CMakeLists.txt b/examples/widgets/richtext/calendar/CMakeLists.txt index 803deb9243..f0ce5defc9 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_qt_gui_executable(calendar WIN32 MACOSX_BUNDLE +add_qt_gui_executable(calendar main.cpp mainwindow.cpp mainwindow.h ) @@ -24,4 +24,5 @@ target_link_libraries(calendar PUBLIC install(TARGETS calendar RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/richtext/orderform/CMakeLists.txt b/examples/widgets/richtext/orderform/CMakeLists.txt index 4fc3c57919..12406d183a 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_qt_gui_executable(orderform WIN32 MACOSX_BUNDLE +add_qt_gui_executable(orderform detailsdialog.cpp detailsdialog.h main.cpp mainwindow.cpp mainwindow.h @@ -29,4 +29,5 @@ endif() install(TARGETS orderform RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/richtext/syntaxhighlighter/CMakeLists.txt b/examples/widgets/richtext/syntaxhighlighter/CMakeLists.txt index d70211e24c..96d824e559 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_qt_gui_executable(syntaxhighlighter WIN32 MACOSX_BUNDLE +add_qt_gui_executable(syntaxhighlighter highlighter.cpp highlighter.h main.cpp mainwindow.cpp mainwindow.h @@ -25,4 +25,5 @@ target_link_libraries(syntaxhighlighter PUBLIC install(TARGETS syntaxhighlighter RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/richtext/textedit/CMakeLists.txt b/examples/widgets/richtext/textedit/CMakeLists.txt index 602baa84f2..12b428c6c4 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_qt_gui_executable(textedit WIN32 MACOSX_BUNDLE +add_qt_gui_executable(textedit main.cpp textedit.cpp textedit.h textedit.qrc ) @@ -30,4 +30,5 @@ endif() install(TARGETS textedit RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/scroller/graphicsview/CMakeLists.txt b/examples/widgets/scroller/graphicsview/CMakeLists.txt index 53ce4ff247..2f4ab32097 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_qt_gui_executable(graphicsview WIN32 MACOSX_BUNDLE +add_qt_gui_executable(graphicsview main.cpp ) target_link_libraries(graphicsview PUBLIC @@ -23,4 +23,5 @@ target_link_libraries(graphicsview PUBLIC install(TARGETS graphicsview RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/statemachine/eventtransitions/CMakeLists.txt b/examples/widgets/statemachine/eventtransitions/CMakeLists.txt index 21372f8856..902bc009d0 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_qt_gui_executable(eventtransitions WIN32 MACOSX_BUNDLE +add_qt_gui_executable(eventtransitions main.cpp ) target_link_libraries(eventtransitions PUBLIC @@ -23,4 +23,5 @@ target_link_libraries(eventtransitions PUBLIC install(TARGETS eventtransitions RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/statemachine/factorial/CMakeLists.txt b/examples/widgets/statemachine/factorial/CMakeLists.txt index e383225705..e7eba926c4 100644 --- a/examples/widgets/statemachine/factorial/CMakeLists.txt +++ b/examples/widgets/statemachine/factorial/CMakeLists.txt @@ -23,4 +23,5 @@ target_link_libraries(factorial PUBLIC install(TARGETS factorial RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/statemachine/pingpong/CMakeLists.txt b/examples/widgets/statemachine/pingpong/CMakeLists.txt index e3745a280d..7f255dd4d1 100644 --- a/examples/widgets/statemachine/pingpong/CMakeLists.txt +++ b/examples/widgets/statemachine/pingpong/CMakeLists.txt @@ -23,4 +23,5 @@ target_link_libraries(pingpong PUBLIC install(TARGETS pingpong RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/statemachine/rogue/CMakeLists.txt b/examples/widgets/statemachine/rogue/CMakeLists.txt index 1ae6b511da..25ca4f45f1 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_qt_gui_executable(rogue WIN32 MACOSX_BUNDLE +add_qt_gui_executable(rogue main.cpp movementtransition.h window.cpp window.h @@ -25,4 +25,5 @@ target_link_libraries(rogue PUBLIC install(TARGETS rogue RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/statemachine/trafficlight/CMakeLists.txt b/examples/widgets/statemachine/trafficlight/CMakeLists.txt index 0122fa72cd..89f05f22ff 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_qt_gui_executable(trafficlight WIN32 MACOSX_BUNDLE +add_qt_gui_executable(trafficlight main.cpp ) target_link_libraries(trafficlight PUBLIC @@ -23,4 +23,5 @@ target_link_libraries(trafficlight PUBLIC install(TARGETS trafficlight RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/statemachine/twowaybutton/CMakeLists.txt b/examples/widgets/statemachine/twowaybutton/CMakeLists.txt index 6c68cdd2fb..9c5bf3cb45 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_qt_gui_executable(twowaybutton WIN32 MACOSX_BUNDLE +add_qt_gui_executable(twowaybutton main.cpp ) target_link_libraries(twowaybutton PUBLIC @@ -23,4 +23,5 @@ target_link_libraries(twowaybutton PUBLIC install(TARGETS twowaybutton RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tools/codecs/CMakeLists.txt b/examples/widgets/tools/codecs/CMakeLists.txt index 0bb5f37938..5a1f429788 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_qt_gui_executable(codecs WIN32 MACOSX_BUNDLE +add_qt_gui_executable(codecs codecs.qrc encodingdialog.cpp encodingdialog.h main.cpp @@ -27,4 +27,5 @@ target_link_libraries(codecs PUBLIC install(TARGETS codecs RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tools/completer/CMakeLists.txt b/examples/widgets/tools/completer/CMakeLists.txt index 8e86cc6b89..855fd54930 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_qt_gui_executable(completer WIN32 MACOSX_BUNDLE +add_qt_gui_executable(completer completer.qrc fsmodel.cpp fsmodel.h main.cpp @@ -26,4 +26,5 @@ target_link_libraries(completer PUBLIC install(TARGETS completer RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tools/customcompleter/CMakeLists.txt b/examples/widgets/tools/customcompleter/CMakeLists.txt index 7ac00d7345..22481eab5c 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_qt_gui_executable(customcompleter WIN32 MACOSX_BUNDLE +add_qt_gui_executable(customcompleter customcompleter.qrc main.cpp mainwindow.cpp mainwindow.h @@ -26,4 +26,5 @@ target_link_libraries(customcompleter PUBLIC install(TARGETS customcompleter RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tools/echoplugin/echowindow/CMakeLists.txt b/examples/widgets/tools/echoplugin/echowindow/CMakeLists.txt index 20615d1e3b..bb5ec4c96a 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_qt_gui_executable(echopluginwindow WIN32 MACOSX_BUNDLE # special case: renamed target +add_qt_gui_executable(echopluginwindow # special case: renamed target echointerface.h echowindow.cpp echowindow.h main.cpp @@ -25,4 +25,5 @@ target_link_libraries(echopluginwindow PUBLIC # special case: renamed target install(TARGETS echopluginwindow # special case: renamed target RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tools/i18n/CMakeLists.txt b/examples/widgets/tools/i18n/CMakeLists.txt index a0347d8453..45d51351ba 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_qt_gui_executable(i18n WIN32 MACOSX_BUNDLE +add_qt_gui_executable(i18n i18n.qrc languagechooser.cpp languagechooser.h main.cpp @@ -26,4 +26,5 @@ target_link_libraries(i18n PUBLIC install(TARGETS i18n RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tools/plugandpaint/app/CMakeLists.txt b/examples/widgets/tools/plugandpaint/app/CMakeLists.txt index a7c642a1be..54c6b15310 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_qt_gui_executable(plugandpaint WIN32 MACOSX_BUNDLE +add_qt_gui_executable(plugandpaint interfaces.h main.cpp mainwindow.cpp mainwindow.h @@ -30,4 +30,5 @@ target_link_libraries(plugandpaint PUBLIC pnp_basictools) # special case install(TARGETS plugandpaint RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tools/regexp/CMakeLists.txt b/examples/widgets/tools/regexp/CMakeLists.txt index 0b64cf06f8..8e3eb4abe8 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_qt_gui_executable(regexp WIN32 MACOSX_BUNDLE +add_qt_gui_executable(regexp main.cpp regexpdialog.cpp regexpdialog.h ) @@ -24,4 +24,5 @@ target_link_libraries(regexp PUBLIC install(TARGETS regexp RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tools/regularexpression/CMakeLists.txt b/examples/widgets/tools/regularexpression/CMakeLists.txt index a9ce374ce2..dcd69756b4 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_qt_gui_executable(regularexpression WIN32 MACOSX_BUNDLE +add_qt_gui_executable(regularexpression main.cpp regularexpression.qrc regularexpressiondialog.cpp regularexpressiondialog.h @@ -25,4 +25,5 @@ target_link_libraries(regularexpression PUBLIC install(TARGETS regularexpression RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tools/settingseditor/CMakeLists.txt b/examples/widgets/tools/settingseditor/CMakeLists.txt index 49a014e359..77177beadd 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_qt_gui_executable(settingseditor WIN32 MACOSX_BUNDLE +add_qt_gui_executable(settingseditor locationdialog.cpp locationdialog.h main.cpp mainwindow.cpp mainwindow.h @@ -27,4 +27,5 @@ target_link_libraries(settingseditor PUBLIC install(TARGETS settingseditor RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tools/styleplugin/stylewindow/CMakeLists.txt b/examples/widgets/tools/styleplugin/stylewindow/CMakeLists.txt index 6e47082471..f23d53c3aa 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_qt_gui_executable(styleplugin WIN32 MACOSX_BUNDLE +add_qt_gui_executable(styleplugin main.cpp stylewindow.cpp stylewindow.h ) @@ -24,4 +24,5 @@ target_link_libraries(styleplugin PUBLIC install(TARGETS styleplugin RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tools/treemodelcompleter/CMakeLists.txt b/examples/widgets/tools/treemodelcompleter/CMakeLists.txt index 9fa16e06dd..d8f3dff929 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_qt_gui_executable(treemodelcompleter WIN32 MACOSX_BUNDLE +add_qt_gui_executable(treemodelcompleter main.cpp mainwindow.cpp mainwindow.h treemodelcompleter.cpp treemodelcompleter.h treemodelcompleter.qrc @@ -25,4 +25,5 @@ target_link_libraries(treemodelcompleter PUBLIC install(TARGETS treemodelcompleter RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tools/undo/CMakeLists.txt b/examples/widgets/tools/undo/CMakeLists.txt index bc4a876211..c8188b8f0f 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_qt_gui_executable(undo WIN32 MACOSX_BUNDLE +add_qt_gui_executable(undo commands.cpp commands.h document.cpp document.h main.cpp @@ -27,4 +27,5 @@ target_link_libraries(undo PUBLIC install(TARGETS undo RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tools/undoframework/CMakeLists.txt b/examples/widgets/tools/undoframework/CMakeLists.txt index 064cb65150..27672edd82 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_qt_gui_executable(undoframework WIN32 MACOSX_BUNDLE +add_qt_gui_executable(undoframework commands.cpp commands.h diagramitem.cpp diagramitem.h diagramscene.cpp diagramscene.h @@ -28,4 +28,5 @@ target_link_libraries(undoframework PUBLIC install(TARGETS undoframework RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/touch/dials/CMakeLists.txt b/examples/widgets/touch/dials/CMakeLists.txt index fa31852b3d..2bfe6b78cf 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_qt_gui_executable(dials WIN32 MACOSX_BUNDLE +add_qt_gui_executable(dials dials.ui main.cpp ) @@ -24,4 +24,5 @@ target_link_libraries(dials PUBLIC install(TARGETS dials RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/touch/fingerpaint/CMakeLists.txt b/examples/widgets/touch/fingerpaint/CMakeLists.txt index 606e6bbc64..4ba2710e67 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_qt_gui_executable(fingerpaint WIN32 MACOSX_BUNDLE +add_qt_gui_executable(fingerpaint main.cpp mainwindow.cpp mainwindow.h scribblearea.cpp scribblearea.h @@ -31,4 +31,5 @@ endif() install(TARGETS fingerpaint RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/touch/knobs/CMakeLists.txt b/examples/widgets/touch/knobs/CMakeLists.txt index c23a11f024..55f9820f68 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_qt_gui_executable(knobs WIN32 MACOSX_BUNDLE +add_qt_gui_executable(knobs knob.cpp knob.h main.cpp ) @@ -24,4 +24,5 @@ target_link_libraries(knobs PUBLIC install(TARGETS knobs RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/touch/pinchzoom/CMakeLists.txt b/examples/widgets/touch/pinchzoom/CMakeLists.txt index 44951db727..f0cece0acd 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_qt_gui_executable(pinchzoom WIN32 MACOSX_BUNDLE +add_qt_gui_executable(pinchzoom graphicsview.cpp graphicsview.h main.cpp mice.qrc @@ -26,4 +26,5 @@ target_link_libraries(pinchzoom PUBLIC install(TARGETS pinchzoom RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/addressbook/part1/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part1/CMakeLists.txt index 6c333420f4..07ff78f7d3 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_qt_gui_executable(part1 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(part1 addressbook.cpp addressbook.h main.cpp ) @@ -24,4 +24,5 @@ target_link_libraries(part1 PUBLIC install(TARGETS part1 RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/addressbook/part2/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part2/CMakeLists.txt index 2c5d438bc5..28a3a6a472 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_qt_gui_executable(part2 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(part2 addressbook.cpp addressbook.h main.cpp ) @@ -24,4 +24,5 @@ target_link_libraries(part2 PUBLIC install(TARGETS part2 RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/addressbook/part3/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part3/CMakeLists.txt index 5be04b1e2f..d8d1147306 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_qt_gui_executable(part3 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(part3 addressbook.cpp addressbook.h main.cpp ) @@ -24,4 +24,5 @@ target_link_libraries(part3 PUBLIC install(TARGETS part3 RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/addressbook/part4/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part4/CMakeLists.txt index 309e8eea66..9818a51181 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_qt_gui_executable(part4 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(part4 addressbook.cpp addressbook.h main.cpp ) @@ -24,4 +24,5 @@ target_link_libraries(part4 PUBLIC install(TARGETS part4 RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/addressbook/part5/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part5/CMakeLists.txt index 9d73fd0e96..6ddf50aac7 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_qt_gui_executable(part5 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(part5 addressbook.cpp addressbook.h finddialog.cpp finddialog.h main.cpp @@ -25,4 +25,5 @@ target_link_libraries(part5 PUBLIC install(TARGETS part5 RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/addressbook/part6/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part6/CMakeLists.txt index 015a4cb244..75b7592484 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_qt_gui_executable(part6 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(part6 addressbook.cpp addressbook.h finddialog.cpp finddialog.h main.cpp @@ -25,4 +25,5 @@ target_link_libraries(part6 PUBLIC install(TARGETS part6 RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/addressbook/part7/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part7/CMakeLists.txt index acb3a2903b..5dcb53e470 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_qt_gui_executable(part7 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(part7 addressbook.cpp addressbook.h finddialog.cpp finddialog.h main.cpp @@ -25,4 +25,5 @@ target_link_libraries(part7 PUBLIC install(TARGETS part7 RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part1/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/part1/CMakeLists.txt index c148f20a03..739d1384d9 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_qt_gui_executable(part1 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(part1 main.cpp ) target_link_libraries(part1 PUBLIC @@ -23,4 +23,5 @@ target_link_libraries(part1 PUBLIC install(TARGETS part1 RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part2/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/part2/CMakeLists.txt index ddbef50ca2..db6bfc8bea 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_qt_gui_executable(part2 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(part2 main.cpp ) target_link_libraries(part2 PUBLIC @@ -23,4 +23,5 @@ target_link_libraries(part2 PUBLIC install(TARGETS part2 RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part3/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/part3/CMakeLists.txt index 66cd8827cf..f1cc350d1e 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_qt_gui_executable(part3 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(part3 main.cpp ) target_link_libraries(part3 PUBLIC @@ -23,4 +23,5 @@ target_link_libraries(part3 PUBLIC install(TARGETS part3 RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part4/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/part4/CMakeLists.txt index 0c7b9f62f9..bfd358f381 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_qt_gui_executable(part4 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(part4 main.cpp ) target_link_libraries(part4 PUBLIC @@ -23,4 +23,5 @@ target_link_libraries(part4 PUBLIC install(TARGETS part4 RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part5/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/part5/CMakeLists.txt index 4fc0df77b7..006b1a6ea5 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_qt_gui_executable(part5 WIN32 MACOSX_BUNDLE +add_qt_gui_executable(part5 main.cpp ) target_link_libraries(part5 PUBLIC @@ -23,4 +23,5 @@ target_link_libraries(part5 PUBLIC install(TARGETS part5 RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/modelview/1_readonly/CMakeLists.txt b/examples/widgets/tutorials/modelview/1_readonly/CMakeLists.txt index ee859409e5..001f6d8070 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_qt_gui_executable(mv_readonly WIN32 MACOSX_BUNDLE +add_qt_gui_executable(mv_readonly main.cpp mymodel.cpp mymodel.h ) @@ -24,4 +24,5 @@ target_link_libraries(mv_readonly PUBLIC install(TARGETS mv_readonly RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/modelview/2_formatting/CMakeLists.txt b/examples/widgets/tutorials/modelview/2_formatting/CMakeLists.txt index 75c5f431c1..6b9d5732cf 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_qt_gui_executable(mv_formatting WIN32 MACOSX_BUNDLE +add_qt_gui_executable(mv_formatting main.cpp mymodel.cpp mymodel.h ) @@ -24,4 +24,5 @@ target_link_libraries(mv_formatting PUBLIC install(TARGETS mv_formatting RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/modelview/3_changingmodel/CMakeLists.txt b/examples/widgets/tutorials/modelview/3_changingmodel/CMakeLists.txt index 60d240f170..52c4ddfc38 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_qt_gui_executable(mv_changingmodel WIN32 MACOSX_BUNDLE +add_qt_gui_executable(mv_changingmodel main.cpp mymodel.cpp mymodel.h ) @@ -24,4 +24,5 @@ target_link_libraries(mv_changingmodel PUBLIC install(TARGETS mv_changingmodel RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/modelview/4_headers/CMakeLists.txt b/examples/widgets/tutorials/modelview/4_headers/CMakeLists.txt index b719caf8ec..b248a47f57 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_qt_gui_executable(mv_headers WIN32 MACOSX_BUNDLE +add_qt_gui_executable(mv_headers main.cpp mymodel.cpp mymodel.h ) @@ -24,4 +24,5 @@ target_link_libraries(mv_headers PUBLIC install(TARGETS mv_headers RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/modelview/5_edit/CMakeLists.txt b/examples/widgets/tutorials/modelview/5_edit/CMakeLists.txt index 67c34521f4..d40e8674d8 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_qt_gui_executable(mv_edit WIN32 MACOSX_BUNDLE +add_qt_gui_executable(mv_edit main.cpp mainwindow.cpp mainwindow.h mymodel.cpp mymodel.h @@ -25,4 +25,5 @@ target_link_libraries(mv_edit PUBLIC install(TARGETS mv_edit RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/modelview/6_treeview/CMakeLists.txt b/examples/widgets/tutorials/modelview/6_treeview/CMakeLists.txt index 2feb364569..592f7bb528 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_qt_gui_executable(mv_tree WIN32 MACOSX_BUNDLE +add_qt_gui_executable(mv_tree main.cpp mainwindow.cpp mainwindow.h ) @@ -24,4 +24,5 @@ target_link_libraries(mv_tree PUBLIC install(TARGETS mv_tree RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/modelview/7_selections/CMakeLists.txt b/examples/widgets/tutorials/modelview/7_selections/CMakeLists.txt index a974313bd7..65b58dfa74 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_qt_gui_executable(mv_selections WIN32 MACOSX_BUNDLE +add_qt_gui_executable(mv_selections main.cpp mainwindow.cpp mainwindow.h ) @@ -24,4 +24,5 @@ target_link_libraries(mv_selections PUBLIC install(TARGETS mv_selections RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/notepad/CMakeLists.txt b/examples/widgets/tutorials/notepad/CMakeLists.txt index 44606d522c..2d1b13e469 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_qt_gui_executable(notepad WIN32 MACOSX_BUNDLE +add_qt_gui_executable(notepad main.cpp notepad.cpp notepad.h notepad.qrc notepad.ui ) @@ -32,4 +32,5 @@ endif() install(TARGETS notepad RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/widgets/childwidget/CMakeLists.txt b/examples/widgets/tutorials/widgets/childwidget/CMakeLists.txt index b5fb51c77d..f6192757b2 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_qt_gui_executable(childwidget WIN32 MACOSX_BUNDLE +add_qt_gui_executable(childwidget main.cpp ) target_link_libraries(childwidget PUBLIC @@ -23,4 +23,5 @@ target_link_libraries(childwidget PUBLIC install(TARGETS childwidget RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/widgets/nestedlayouts/CMakeLists.txt b/examples/widgets/tutorials/widgets/nestedlayouts/CMakeLists.txt index e963dd77f3..59f0053c1e 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_qt_gui_executable(nestedlayouts WIN32 MACOSX_BUNDLE +add_qt_gui_executable(nestedlayouts main.cpp ) target_link_libraries(nestedlayouts PUBLIC @@ -23,4 +23,5 @@ target_link_libraries(nestedlayouts PUBLIC install(TARGETS nestedlayouts RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/widgets/toplevel/CMakeLists.txt b/examples/widgets/tutorials/widgets/toplevel/CMakeLists.txt index b607403c55..033746d0d7 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_qt_gui_executable(toplevel WIN32 MACOSX_BUNDLE +add_qt_gui_executable(toplevel main.cpp ) target_link_libraries(toplevel PUBLIC @@ -23,4 +23,5 @@ target_link_libraries(toplevel PUBLIC install(TARGETS toplevel RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/tutorials/widgets/windowlayout/CMakeLists.txt b/examples/widgets/tutorials/widgets/windowlayout/CMakeLists.txt index a9db86bccf..3f3335d9e7 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_qt_gui_executable(windowlayout WIN32 MACOSX_BUNDLE +add_qt_gui_executable(windowlayout main.cpp ) target_link_libraries(windowlayout PUBLIC @@ -23,4 +23,5 @@ target_link_libraries(windowlayout PUBLIC install(TARGETS windowlayout RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/widgets/analogclock/CMakeLists.txt b/examples/widgets/widgets/analogclock/CMakeLists.txt index 32ed38e46a..7debc7114b 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_qt_gui_executable(analogclock WIN32 MACOSX_BUNDLE +add_qt_gui_executable(analogclock analogclock.cpp analogclock.h main.cpp ) @@ -24,4 +24,5 @@ target_link_libraries(analogclock PUBLIC install(TARGETS analogclock RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/widgets/calculator/CMakeLists.txt b/examples/widgets/widgets/calculator/CMakeLists.txt index cd8a837281..9b689b58c0 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_qt_gui_executable(calculator WIN32 MACOSX_BUNDLE +add_qt_gui_executable(calculator button.cpp button.h calculator.cpp calculator.h main.cpp @@ -25,4 +25,5 @@ target_link_libraries(calculator PUBLIC install(TARGETS calculator RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/widgets/calendarwidget/CMakeLists.txt b/examples/widgets/widgets/calendarwidget/CMakeLists.txt index 4c09d47a17..4d6f7b7478 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_qt_gui_executable(calendarwidget WIN32 MACOSX_BUNDLE +add_qt_gui_executable(calendarwidget main.cpp window.cpp window.h ) @@ -24,4 +24,5 @@ target_link_libraries(calendarwidget PUBLIC install(TARGETS calendarwidget RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/widgets/charactermap/CMakeLists.txt b/examples/widgets/widgets/charactermap/CMakeLists.txt index fdd5d75b26..51bb16ba5e 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_qt_gui_executable(charactermap WIN32 MACOSX_BUNDLE +add_qt_gui_executable(charactermap characterwidget.cpp characterwidget.h main.cpp mainwindow.cpp mainwindow.h @@ -25,4 +25,5 @@ target_link_libraries(charactermap PUBLIC install(TARGETS charactermap RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/widgets/codeeditor/CMakeLists.txt b/examples/widgets/widgets/codeeditor/CMakeLists.txt index 8e3e3dbdc1..8d60821cf8 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_qt_gui_executable(codeeditor WIN32 MACOSX_BUNDLE +add_qt_gui_executable(codeeditor codeeditor.cpp codeeditor.h main.cpp ) @@ -24,4 +24,5 @@ target_link_libraries(codeeditor PUBLIC install(TARGETS codeeditor RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/widgets/digitalclock/CMakeLists.txt b/examples/widgets/widgets/digitalclock/CMakeLists.txt index 978d208b95..463209b2db 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_qt_gui_executable(digitalclock WIN32 MACOSX_BUNDLE +add_qt_gui_executable(digitalclock digitalclock.cpp digitalclock.h main.cpp ) @@ -24,4 +24,5 @@ target_link_libraries(digitalclock PUBLIC install(TARGETS digitalclock RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/widgets/elidedlabel/CMakeLists.txt b/examples/widgets/widgets/elidedlabel/CMakeLists.txt index e21f5a1e15..fece6e4db9 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_qt_gui_executable(elidedlabel WIN32 MACOSX_BUNDLE +add_qt_gui_executable(elidedlabel elidedlabel.cpp elidedlabel.h main.cpp testwidget.cpp testwidget.h @@ -29,4 +29,5 @@ target_link_libraries(elidedlabel PUBLIC install(TARGETS elidedlabel RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/widgets/groupbox/CMakeLists.txt b/examples/widgets/widgets/groupbox/CMakeLists.txt index f6d2769a65..c5b3faaa40 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_qt_gui_executable(groupbox WIN32 MACOSX_BUNDLE +add_qt_gui_executable(groupbox main.cpp window.cpp window.h ) @@ -24,4 +24,5 @@ target_link_libraries(groupbox PUBLIC install(TARGETS groupbox RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/widgets/icons/CMakeLists.txt b/examples/widgets/widgets/icons/CMakeLists.txt index 0306ff6920..1b489d06b2 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_qt_gui_executable(icons WIN32 MACOSX_BUNDLE +add_qt_gui_executable(icons iconpreviewarea.cpp iconpreviewarea.h iconsizespinbox.cpp iconsizespinbox.h imagedelegate.cpp imagedelegate.h @@ -29,4 +29,5 @@ target_link_libraries(icons PUBLIC install(TARGETS icons RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/widgets/imageviewer/CMakeLists.txt b/examples/widgets/widgets/imageviewer/CMakeLists.txt index 3bdcc27d9e..6f06a01b49 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_qt_gui_executable(imageviewer WIN32 MACOSX_BUNDLE +add_qt_gui_executable(imageviewer imageviewer.cpp imageviewer.h main.cpp ) @@ -30,4 +30,5 @@ endif() install(TARGETS imageviewer RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/widgets/lineedits/CMakeLists.txt b/examples/widgets/widgets/lineedits/CMakeLists.txt index 0d39f97315..035b0c5fd5 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_qt_gui_executable(lineedits WIN32 MACOSX_BUNDLE +add_qt_gui_executable(lineedits main.cpp window.cpp window.h ) @@ -24,4 +24,5 @@ target_link_libraries(lineedits PUBLIC install(TARGETS lineedits RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/widgets/mousebuttons/CMakeLists.txt b/examples/widgets/widgets/mousebuttons/CMakeLists.txt index a2bf41193b..acba290da0 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_qt_gui_executable(mousebuttons WIN32 MACOSX_BUNDLE +add_qt_gui_executable(mousebuttons buttontester.cpp buttontester.h main.cpp ) @@ -26,4 +26,5 @@ target_link_libraries(mousebuttons PUBLIC install(TARGETS mousebuttons RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/widgets/movie/CMakeLists.txt b/examples/widgets/widgets/movie/CMakeLists.txt index 46c8474002..ea82d7ee5a 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_qt_gui_executable(movie WIN32 MACOSX_BUNDLE +add_qt_gui_executable(movie main.cpp movieplayer.cpp movieplayer.h ) @@ -24,4 +24,5 @@ target_link_libraries(movie PUBLIC install(TARGETS movie RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/widgets/scribble/CMakeLists.txt b/examples/widgets/widgets/scribble/CMakeLists.txt index 9fb19a6442..3363c47ba5 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_qt_gui_executable(scribble WIN32 MACOSX_BUNDLE +add_qt_gui_executable(scribble main.cpp mainwindow.cpp mainwindow.h scribblearea.cpp scribblearea.h @@ -31,4 +31,5 @@ endif() install(TARGETS scribble RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/widgets/shapedclock/CMakeLists.txt b/examples/widgets/widgets/shapedclock/CMakeLists.txt index 60e2bd208e..c01243d09e 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_qt_gui_executable(shapedclock WIN32 MACOSX_BUNDLE +add_qt_gui_executable(shapedclock main.cpp shapedclock.cpp shapedclock.h ) @@ -24,4 +24,5 @@ target_link_libraries(shapedclock PUBLIC install(TARGETS shapedclock RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/widgets/sliders/CMakeLists.txt b/examples/widgets/widgets/sliders/CMakeLists.txt index db36514007..11402b467e 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_qt_gui_executable(sliders WIN32 MACOSX_BUNDLE +add_qt_gui_executable(sliders main.cpp slidersgroup.cpp slidersgroup.h window.cpp window.h @@ -25,4 +25,5 @@ target_link_libraries(sliders PUBLIC install(TARGETS sliders RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/widgets/spinboxes/CMakeLists.txt b/examples/widgets/widgets/spinboxes/CMakeLists.txt index 6bb7618f6b..ae9f577b74 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_qt_gui_executable(spinboxes WIN32 MACOSX_BUNDLE +add_qt_gui_executable(spinboxes main.cpp window.cpp window.h ) @@ -24,4 +24,5 @@ target_link_libraries(spinboxes PUBLIC install(TARGETS spinboxes RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/widgets/styles/CMakeLists.txt b/examples/widgets/widgets/styles/CMakeLists.txt index fd639e17ed..f9d83dc3b2 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_qt_gui_executable(styles WIN32 MACOSX_BUNDLE +add_qt_gui_executable(styles main.cpp norwegianwoodstyle.cpp norwegianwoodstyle.h styles.qrc @@ -26,4 +26,5 @@ target_link_libraries(styles PUBLIC install(TARGETS styles RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/widgets/stylesheet/CMakeLists.txt b/examples/widgets/widgets/stylesheet/CMakeLists.txt index 0a38fdd3e5..574acc88a5 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_qt_gui_executable(stylesheet WIN32 MACOSX_BUNDLE +add_qt_gui_executable(stylesheet main.cpp mainwindow.cpp mainwindow.h mainwindow.ui stylesheet.qrc @@ -26,4 +26,5 @@ target_link_libraries(stylesheet PUBLIC install(TARGETS stylesheet RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/widgets/tablet/CMakeLists.txt b/examples/widgets/widgets/tablet/CMakeLists.txt index ee9e2b7e26..568d9c17d7 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_qt_gui_executable(qttablet WIN32 MACOSX_BUNDLE +add_qt_gui_executable(qttablet images.qrc main.cpp mainwindow.cpp mainwindow.h @@ -27,4 +27,5 @@ target_link_libraries(qttablet PUBLIC install(TARGETS qttablet RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/widgets/tetrix/CMakeLists.txt b/examples/widgets/widgets/tetrix/CMakeLists.txt index 205a0d2744..8da13d1f23 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_qt_gui_executable(tetrix WIN32 MACOSX_BUNDLE +add_qt_gui_executable(tetrix main.cpp tetrixboard.cpp tetrixboard.h tetrixpiece.cpp tetrixpiece.h @@ -26,4 +26,5 @@ target_link_libraries(tetrix PUBLIC install(TARGETS tetrix RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/widgets/tooltips/CMakeLists.txt b/examples/widgets/widgets/tooltips/CMakeLists.txt index 038a8881f2..085da5b7e1 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_qt_gui_executable(tooltips WIN32 MACOSX_BUNDLE +add_qt_gui_executable(tooltips main.cpp shapeitem.cpp shapeitem.h sortingbox.cpp sortingbox.h @@ -26,4 +26,5 @@ target_link_libraries(tooltips PUBLIC install(TARGETS tooltips RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/widgets/validators/CMakeLists.txt b/examples/widgets/widgets/validators/CMakeLists.txt index 5ed3690158..be9fdb1cd2 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_qt_gui_executable(validators WIN32 MACOSX_BUNDLE +add_qt_gui_executable(validators ledwidget.cpp ledwidget.h localeselector.cpp localeselector.h main.cpp @@ -27,4 +27,5 @@ target_link_libraries(validators PUBLIC install(TARGETS validators RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/widgets/wiggly/CMakeLists.txt b/examples/widgets/widgets/wiggly/CMakeLists.txt index da0e64a864..0e721370ba 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_qt_gui_executable(wiggly WIN32 MACOSX_BUNDLE +add_qt_gui_executable(wiggly dialog.cpp dialog.h main.cpp wigglywidget.cpp wigglywidget.h @@ -25,4 +25,5 @@ target_link_libraries(wiggly PUBLIC install(TARGETS wiggly RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/widgets/windowflags/CMakeLists.txt b/examples/widgets/widgets/windowflags/CMakeLists.txt index f7da42114d..4b6d325db5 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_qt_gui_executable(windowflags WIN32 MACOSX_BUNDLE +add_qt_gui_executable(windowflags controllerwindow.cpp controllerwindow.h main.cpp previewwindow.cpp previewwindow.h @@ -25,4 +25,5 @@ target_link_libraries(windowflags PUBLIC install(TARGETS windowflags RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/widgets/windowcontainer/CMakeLists.txt b/examples/widgets/windowcontainer/CMakeLists.txt index 80c8897c9b..1626934830 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_qt_gui_executable(windowcontainer WIN32 MACOSX_BUNDLE +add_qt_gui_executable(windowcontainer ../../gui/openglwindow/openglwindow.cpp ../../gui/openglwindow/openglwindow.h windowcontainer.cpp ) @@ -27,4 +27,5 @@ target_link_libraries(windowcontainer PUBLIC install(TARGETS windowcontainer RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) -- cgit v1.2.3