diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2021-12-08 16:42:09 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2021-12-13 14:16:26 +0000 |
| commit | 51f22a3a0495d8418a5d6dd0f09771c0347441b9 (patch) | |
| tree | 34b5c133cd5e808e98c63b1e801400b716e34d9d /examples/widgets | |
| parent | 9ca7429dff4b5d46114ca36147f65b61d5e61290 (diff) | |
Examples: Remove remaining conversion markers in CMakeLists.txt
Pick-to: 6.3
Change-Id: Ia5d474a3efd6aadbd0ef1537318f2f24e6c24fee
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'examples/widgets')
162 files changed, 32 insertions, 395 deletions
diff --git a/examples/widgets/CMakeLists.txt b/examples/widgets/CMakeLists.txt index 753e3b8499..13f8066ed8 100644 --- a/examples/widgets/CMakeLists.txt +++ b/examples/widgets/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from widgets.pro. - if(NOT TARGET Qt::Widgets) return() endif() @@ -24,7 +22,7 @@ add_subdirectory(widgets) if(QT_FEATURE_draganddrop) add_subdirectory(draganddrop) endif() -if(QT_FEATURE_cursor) # special case +if(QT_FEATURE_cursor) add_subdirectory(mainwindows) endif() if(QT_FEATURE_opengl AND TARGET Qt::Gui) diff --git a/examples/widgets/animation/CMakeLists.txt b/examples/widgets/animation/CMakeLists.txt index 70f484a778..d9a18bb866 100644 --- a/examples/widgets/animation/CMakeLists.txt +++ b/examples/widgets/animation/CMakeLists.txt @@ -1,3 +1 @@ -# Generated from animation.pro. - qt_internal_add_example(easing) diff --git a/examples/widgets/animation/easing/CMakeLists.txt b/examples/widgets/animation/easing/CMakeLists.txt index 503c394ec6..2067b0c0d3 100644 --- a/examples/widgets/animation/easing/CMakeLists.txt +++ b/examples/widgets/animation/easing/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from easing.pro. - cmake_minimum_required(VERSION 3.16) project(easing LANGUAGES CXX) diff --git a/examples/widgets/desktop/CMakeLists.txt b/examples/widgets/desktop/CMakeLists.txt index b317205c43..169fa9ffac 100644 --- a/examples/widgets/desktop/CMakeLists.txt +++ b/examples/widgets/desktop/CMakeLists.txt @@ -1,4 +1,2 @@ -# Generated from desktop.pro. - qt_internal_add_example(screenshot) qt_internal_add_example(systray) diff --git a/examples/widgets/desktop/screenshot/CMakeLists.txt b/examples/widgets/desktop/screenshot/CMakeLists.txt index bdeec25c01..95bba7ee31 100644 --- a/examples/widgets/desktop/screenshot/CMakeLists.txt +++ b/examples/widgets/desktop/screenshot/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from screenshot.pro. - cmake_minimum_required(VERSION 3.16) project(screenshot LANGUAGES CXX) diff --git a/examples/widgets/desktop/systray/CMakeLists.txt b/examples/widgets/desktop/systray/CMakeLists.txt index dd136a293d..c2b0d859ba 100644 --- a/examples/widgets/desktop/systray/CMakeLists.txt +++ b/examples/widgets/desktop/systray/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from systray.pro. - cmake_minimum_required(VERSION 3.16) project(systray LANGUAGES CXX) diff --git a/examples/widgets/dialogs/CMakeLists.txt b/examples/widgets/dialogs/CMakeLists.txt index 32f8bc29a8..90361e2e28 100644 --- a/examples/widgets/dialogs/CMakeLists.txt +++ b/examples/widgets/dialogs/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from dialogs.pro. - if(QT_FEATURE_wizard) qt_internal_add_example(classwizard) qt_internal_add_example(trivialwizard) diff --git a/examples/widgets/dialogs/classwizard/CMakeLists.txt b/examples/widgets/dialogs/classwizard/CMakeLists.txt index ea964bd937..c9c4b44f59 100644 --- a/examples/widgets/dialogs/classwizard/CMakeLists.txt +++ b/examples/widgets/dialogs/classwizard/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from classwizard.pro. - cmake_minimum_required(VERSION 3.16) project(classwizard LANGUAGES CXX) diff --git a/examples/widgets/dialogs/extension/CMakeLists.txt b/examples/widgets/dialogs/extension/CMakeLists.txt index 6c7d9a3454..243fb13a47 100644 --- a/examples/widgets/dialogs/extension/CMakeLists.txt +++ b/examples/widgets/dialogs/extension/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from extension.pro. - cmake_minimum_required(VERSION 3.16) project(extension LANGUAGES CXX) diff --git a/examples/widgets/dialogs/findfiles/CMakeLists.txt b/examples/widgets/dialogs/findfiles/CMakeLists.txt index 2e41e64ecb..4d870b193e 100644 --- a/examples/widgets/dialogs/findfiles/CMakeLists.txt +++ b/examples/widgets/dialogs/findfiles/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from findfiles.pro. - cmake_minimum_required(VERSION 3.16) project(findfiles LANGUAGES CXX) diff --git a/examples/widgets/dialogs/licensewizard/CMakeLists.txt b/examples/widgets/dialogs/licensewizard/CMakeLists.txt index e9bfc7b588..c043ff18fd 100644 --- a/examples/widgets/dialogs/licensewizard/CMakeLists.txt +++ b/examples/widgets/dialogs/licensewizard/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from licensewizard.pro. - cmake_minimum_required(VERSION 3.16) project(licensewizard LANGUAGES CXX) diff --git a/examples/widgets/dialogs/standarddialogs/CMakeLists.txt b/examples/widgets/dialogs/standarddialogs/CMakeLists.txt index f2e368333e..5a709a5cee 100644 --- a/examples/widgets/dialogs/standarddialogs/CMakeLists.txt +++ b/examples/widgets/dialogs/standarddialogs/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from standarddialogs.pro. - cmake_minimum_required(VERSION 3.16) project(standarddialogs LANGUAGES CXX) diff --git a/examples/widgets/dialogs/tabdialog/CMakeLists.txt b/examples/widgets/dialogs/tabdialog/CMakeLists.txt index af4930c3d5..13d41ddee8 100644 --- a/examples/widgets/dialogs/tabdialog/CMakeLists.txt +++ b/examples/widgets/dialogs/tabdialog/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from tabdialog.pro. - cmake_minimum_required(VERSION 3.16) project(tabdialog LANGUAGES CXX) diff --git a/examples/widgets/dialogs/trivialwizard/CMakeLists.txt b/examples/widgets/dialogs/trivialwizard/CMakeLists.txt index 1abb5bbffc..9502ebbd78 100644 --- a/examples/widgets/dialogs/trivialwizard/CMakeLists.txt +++ b/examples/widgets/dialogs/trivialwizard/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from trivialwizard.pro. - cmake_minimum_required(VERSION 3.16) project(trivialwizard LANGUAGES CXX) diff --git a/examples/widgets/draganddrop/CMakeLists.txt b/examples/widgets/draganddrop/CMakeLists.txt index 87ba702aca..c7d8d068d6 100644 --- a/examples/widgets/draganddrop/CMakeLists.txt +++ b/examples/widgets/draganddrop/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from draganddrop.pro. - qt_internal_add_example(draggableicons) qt_internal_add_example(draggabletext) qt_internal_add_example(dropsite) diff --git a/examples/widgets/draganddrop/draggableicons/CMakeLists.txt b/examples/widgets/draganddrop/draggableicons/CMakeLists.txt index c6ebe53749..ee157bbf25 100644 --- a/examples/widgets/draganddrop/draggableicons/CMakeLists.txt +++ b/examples/widgets/draganddrop/draggableicons/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from draggableicons.pro. - cmake_minimum_required(VERSION 3.16) project(draggableicons LANGUAGES CXX) diff --git a/examples/widgets/draganddrop/draggabletext/CMakeLists.txt b/examples/widgets/draganddrop/draggabletext/CMakeLists.txt index 0ae6758d41..7aba6ac56c 100644 --- a/examples/widgets/draganddrop/draggabletext/CMakeLists.txt +++ b/examples/widgets/draganddrop/draggabletext/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from draggabletext.pro. - cmake_minimum_required(VERSION 3.16) project(draggabletext LANGUAGES CXX) diff --git a/examples/widgets/draganddrop/dropsite/CMakeLists.txt b/examples/widgets/draganddrop/dropsite/CMakeLists.txt index 40244ab65c..a3a4d0fbe8 100644 --- a/examples/widgets/draganddrop/dropsite/CMakeLists.txt +++ b/examples/widgets/draganddrop/dropsite/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from dropsite.pro. - cmake_minimum_required(VERSION 3.16) project(dropsite LANGUAGES CXX) diff --git a/examples/widgets/draganddrop/fridgemagnets/CMakeLists.txt b/examples/widgets/draganddrop/fridgemagnets/CMakeLists.txt index eef163b682..2f2087fd3d 100644 --- a/examples/widgets/draganddrop/fridgemagnets/CMakeLists.txt +++ b/examples/widgets/draganddrop/fridgemagnets/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from fridgemagnets.pro. - cmake_minimum_required(VERSION 3.16) project(fridgemagnets LANGUAGES CXX) diff --git a/examples/widgets/draganddrop/puzzle/CMakeLists.txt b/examples/widgets/draganddrop/puzzle/CMakeLists.txt index 9cb2a85437..cf6350f16d 100644 --- a/examples/widgets/draganddrop/puzzle/CMakeLists.txt +++ b/examples/widgets/draganddrop/puzzle/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from puzzle.pro. - cmake_minimum_required(VERSION 3.16) project(puzzle LANGUAGES CXX) @@ -13,21 +11,21 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/draganddrop_puzzle") # special case +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/draganddrop_puzzle") find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) -qt_add_executable(draganddrop_puzzle # special case: renamed puzzle +qt_add_executable(draganddrop_puzzle main.cpp mainwindow.cpp mainwindow.h pieceslist.cpp pieceslist.h puzzlewidget.cpp puzzlewidget.h ) -set_target_properties(draganddrop_puzzle PROPERTIES # special case +set_target_properties(draganddrop_puzzle PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) -target_link_libraries(draganddrop_puzzle PUBLIC # special case +target_link_libraries(draganddrop_puzzle PUBLIC Qt::Core Qt::Gui Qt::Widgets @@ -39,14 +37,14 @@ set(puzzle_resource_files "example.jpg" ) -qt_add_resources(draganddrop_puzzle "puzzle" # special case +qt_add_resources(draganddrop_puzzle "puzzle" PREFIX "/images" FILES ${puzzle_resource_files} ) -install(TARGETS draganddrop_puzzle # special case: renamed puzzle +install(TARGETS draganddrop_puzzle RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/widgets/effects/CMakeLists.txt b/examples/widgets/effects/CMakeLists.txt index 1f62945f76..8b1471d1c2 100644 --- a/examples/widgets/effects/CMakeLists.txt +++ b/examples/widgets/effects/CMakeLists.txt @@ -1,4 +1,2 @@ -# Generated from effects.pro. - qt_internal_add_example(blurpicker) qt_internal_add_example(fademessage) diff --git a/examples/widgets/effects/blurpicker/CMakeLists.txt b/examples/widgets/effects/blurpicker/CMakeLists.txt index ee2572a1a2..679b788ed8 100644 --- a/examples/widgets/effects/blurpicker/CMakeLists.txt +++ b/examples/widgets/effects/blurpicker/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from blurpicker.pro. - cmake_minimum_required(VERSION 3.16) project(blurpicker LANGUAGES CXX) diff --git a/examples/widgets/effects/fademessage/CMakeLists.txt b/examples/widgets/effects/fademessage/CMakeLists.txt index da736fe015..c561189f5a 100644 --- a/examples/widgets/effects/fademessage/CMakeLists.txt +++ b/examples/widgets/effects/fademessage/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from fademessage.pro. - cmake_minimum_required(VERSION 3.16) project(fademessage LANGUAGES CXX) diff --git a/examples/widgets/gallery/CMakeLists.txt b/examples/widgets/gallery/CMakeLists.txt index 6e1726f8f8..6cee5313b8 100644 --- a/examples/widgets/gallery/CMakeLists.txt +++ b/examples/widgets/gallery/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from gallery.pro. - cmake_minimum_required(VERSION 3.16) project(gallery LANGUAGES CXX) diff --git a/examples/widgets/gestures/CMakeLists.txt b/examples/widgets/gestures/CMakeLists.txt index 34fb6d0202..ccd2654936 100644 --- a/examples/widgets/gestures/CMakeLists.txt +++ b/examples/widgets/gestures/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from gestures.pro. - if(NOT TARGET Qt::Widgets) return() endif() diff --git a/examples/widgets/gestures/imagegestures/CMakeLists.txt b/examples/widgets/gestures/imagegestures/CMakeLists.txt index c7a1b8f13e..9094bfab3d 100644 --- a/examples/widgets/gestures/imagegestures/CMakeLists.txt +++ b/examples/widgets/gestures/imagegestures/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from imagegestures.pro. - cmake_minimum_required(VERSION 3.16) project(imagegestures LANGUAGES CXX) diff --git a/examples/widgets/graphicsview/CMakeLists.txt b/examples/widgets/graphicsview/CMakeLists.txt index 961807eb55..86936a8321 100644 --- a/examples/widgets/graphicsview/CMakeLists.txt +++ b/examples/widgets/graphicsview/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from graphicsview.pro. - qt_internal_add_example(chip) qt_internal_add_example(elasticnodes) qt_internal_add_example(embeddeddialogs) diff --git a/examples/widgets/graphicsview/anchorlayout/CMakeLists.txt b/examples/widgets/graphicsview/anchorlayout/CMakeLists.txt index 8b31907f66..f4151c77b5 100644 --- a/examples/widgets/graphicsview/anchorlayout/CMakeLists.txt +++ b/examples/widgets/graphicsview/anchorlayout/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from anchorlayout.pro. - cmake_minimum_required(VERSION 3.16) project(anchorlayout LANGUAGES CXX) diff --git a/examples/widgets/graphicsview/basicgraphicslayouts/CMakeLists.txt b/examples/widgets/graphicsview/basicgraphicslayouts/CMakeLists.txt index 1c7363aedd..a788419124 100644 --- a/examples/widgets/graphicsview/basicgraphicslayouts/CMakeLists.txt +++ b/examples/widgets/graphicsview/basicgraphicslayouts/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from basicgraphicslayouts.pro. - cmake_minimum_required(VERSION 3.16) project(basicgraphicslayouts LANGUAGES CXX) diff --git a/examples/widgets/graphicsview/chip/CMakeLists.txt b/examples/widgets/graphicsview/chip/CMakeLists.txt index f614113afb..dc48cdd84f 100644 --- a/examples/widgets/graphicsview/chip/CMakeLists.txt +++ b/examples/widgets/graphicsview/chip/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from chip.pro. - cmake_minimum_required(VERSION 3.16) project(chip LANGUAGES CXX) diff --git a/examples/widgets/graphicsview/collidingmice/CMakeLists.txt b/examples/widgets/graphicsview/collidingmice/CMakeLists.txt index 626441e4b0..aab329528f 100644 --- a/examples/widgets/graphicsview/collidingmice/CMakeLists.txt +++ b/examples/widgets/graphicsview/collidingmice/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from collidingmice.pro. - cmake_minimum_required(VERSION 3.16) project(collidingmice LANGUAGES CXX) diff --git a/examples/widgets/graphicsview/diagramscene/CMakeLists.txt b/examples/widgets/graphicsview/diagramscene/CMakeLists.txt index 1c00e498be..5559f16dea 100644 --- a/examples/widgets/graphicsview/diagramscene/CMakeLists.txt +++ b/examples/widgets/graphicsview/diagramscene/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from diagramscene.pro. - cmake_minimum_required(VERSION 3.16) project(diagramscene LANGUAGES CXX) diff --git a/examples/widgets/graphicsview/dragdroprobot/CMakeLists.txt b/examples/widgets/graphicsview/dragdroprobot/CMakeLists.txt index 3ca5251a53..eb4f8bf00f 100644 --- a/examples/widgets/graphicsview/dragdroprobot/CMakeLists.txt +++ b/examples/widgets/graphicsview/dragdroprobot/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from dragdroprobot.pro. - cmake_minimum_required(VERSION 3.16) project(dragdroprobot LANGUAGES CXX) diff --git a/examples/widgets/graphicsview/elasticnodes/CMakeLists.txt b/examples/widgets/graphicsview/elasticnodes/CMakeLists.txt index 090d646f5c..369ed964c5 100644 --- a/examples/widgets/graphicsview/elasticnodes/CMakeLists.txt +++ b/examples/widgets/graphicsview/elasticnodes/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from elasticnodes.pro. - cmake_minimum_required(VERSION 3.16) project(elasticnodes LANGUAGES CXX) diff --git a/examples/widgets/graphicsview/embeddeddialogs/CMakeLists.txt b/examples/widgets/graphicsview/embeddeddialogs/CMakeLists.txt index 6c1896bbd3..63eecd3be9 100644 --- a/examples/widgets/graphicsview/embeddeddialogs/CMakeLists.txt +++ b/examples/widgets/graphicsview/embeddeddialogs/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from embeddeddialogs.pro. - cmake_minimum_required(VERSION 3.16) project(embeddeddialogs LANGUAGES CXX) diff --git a/examples/widgets/graphicsview/flowlayout/CMakeLists.txt b/examples/widgets/graphicsview/flowlayout/CMakeLists.txt index 502dbe9457..9093f6303b 100644 --- a/examples/widgets/graphicsview/flowlayout/CMakeLists.txt +++ b/examples/widgets/graphicsview/flowlayout/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from flowlayout.pro. - cmake_minimum_required(VERSION 3.16) project(flowlayout LANGUAGES CXX) @@ -13,26 +11,26 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/graphicsview_flowlayout") # special case +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/graphicsview_flowlayout") find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) -qt_add_executable(graphicsview_flowlayout # special case: renamed flowlayout +qt_add_executable(graphicsview_flowlayout flowlayout.cpp flowlayout.h main.cpp window.cpp window.h ) -set_target_properties(graphicsview_flowlayout PROPERTIES # special case +set_target_properties(graphicsview_flowlayout PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) -target_link_libraries(graphicsview_flowlayout PUBLIC # special case +target_link_libraries(graphicsview_flowlayout PUBLIC Qt::Core Qt::Gui Qt::Widgets ) -install(TARGETS graphicsview_flowlayout # special case: renamed flowlayout +install(TARGETS graphicsview_flowlayout 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 27dc7273fb..73f25bb156 100644 --- a/examples/widgets/graphicsview/simpleanchorlayout/CMakeLists.txt +++ b/examples/widgets/graphicsview/simpleanchorlayout/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from simpleanchorlayout.pro. - cmake_minimum_required(VERSION 3.16) project(simpleanchorlayout LANGUAGES CXX) diff --git a/examples/widgets/graphicsview/weatheranchorlayout/CMakeLists.txt b/examples/widgets/graphicsview/weatheranchorlayout/CMakeLists.txt index 8490d8a951..92056a1c51 100644 --- a/examples/widgets/graphicsview/weatheranchorlayout/CMakeLists.txt +++ b/examples/widgets/graphicsview/weatheranchorlayout/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from weatheranchorlayout.pro. - cmake_minimum_required(VERSION 3.16) project(weatheranchorlayout LANGUAGES CXX) diff --git a/examples/widgets/itemviews/CMakeLists.txt b/examples/widgets/itemviews/CMakeLists.txt index 10d77c43c8..df7e8cefec 100644 --- a/examples/widgets/itemviews/CMakeLists.txt +++ b/examples/widgets/itemviews/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from itemviews.pro. - qt_internal_add_example(addressbook) qt_internal_add_example(basicsortfiltermodel) qt_internal_add_example(chart) diff --git a/examples/widgets/itemviews/addressbook/CMakeLists.txt b/examples/widgets/itemviews/addressbook/CMakeLists.txt index c6146039a1..e697186600 100644 --- a/examples/widgets/itemviews/addressbook/CMakeLists.txt +++ b/examples/widgets/itemviews/addressbook/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from addressbook.pro. - cmake_minimum_required(VERSION 3.16) project(addressbook LANGUAGES CXX) diff --git a/examples/widgets/itemviews/basicsortfiltermodel/CMakeLists.txt b/examples/widgets/itemviews/basicsortfiltermodel/CMakeLists.txt index cb5134361f..3046ab25b1 100644 --- a/examples/widgets/itemviews/basicsortfiltermodel/CMakeLists.txt +++ b/examples/widgets/itemviews/basicsortfiltermodel/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from basicsortfiltermodel.pro. - cmake_minimum_required(VERSION 3.16) project(basicsortfiltermodel LANGUAGES CXX) diff --git a/examples/widgets/itemviews/chart/CMakeLists.txt b/examples/widgets/itemviews/chart/CMakeLists.txt index d1918b82ea..8e749211f2 100644 --- a/examples/widgets/itemviews/chart/CMakeLists.txt +++ b/examples/widgets/itemviews/chart/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from chart.pro. - cmake_minimum_required(VERSION 3.16) project(chart LANGUAGES CXX) diff --git a/examples/widgets/itemviews/coloreditorfactory/CMakeLists.txt b/examples/widgets/itemviews/coloreditorfactory/CMakeLists.txt index 6b83754e5a..0538d4ecd8 100644 --- a/examples/widgets/itemviews/coloreditorfactory/CMakeLists.txt +++ b/examples/widgets/itemviews/coloreditorfactory/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from coloreditorfactory.pro. - cmake_minimum_required(VERSION 3.16) project(coloreditorfactory LANGUAGES CXX) diff --git a/examples/widgets/itemviews/combowidgetmapper/CMakeLists.txt b/examples/widgets/itemviews/combowidgetmapper/CMakeLists.txt index 8b88700952..9bd809dab9 100644 --- a/examples/widgets/itemviews/combowidgetmapper/CMakeLists.txt +++ b/examples/widgets/itemviews/combowidgetmapper/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from combowidgetmapper.pro. - cmake_minimum_required(VERSION 3.16) project(combowidgetmapper LANGUAGES CXX) diff --git a/examples/widgets/itemviews/customsortfiltermodel/CMakeLists.txt b/examples/widgets/itemviews/customsortfiltermodel/CMakeLists.txt index 6858d3372c..da4d4bdf0a 100644 --- a/examples/widgets/itemviews/customsortfiltermodel/CMakeLists.txt +++ b/examples/widgets/itemviews/customsortfiltermodel/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from customsortfiltermodel.pro. - cmake_minimum_required(VERSION 3.16) project(customsortfiltermodel LANGUAGES CXX) diff --git a/examples/widgets/itemviews/dirview/CMakeLists.txt b/examples/widgets/itemviews/dirview/CMakeLists.txt index cd0e67056e..cea54f5847 100644 --- a/examples/widgets/itemviews/dirview/CMakeLists.txt +++ b/examples/widgets/itemviews/dirview/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from dirview.pro. - cmake_minimum_required(VERSION 3.16) project(dirview LANGUAGES CXX) diff --git a/examples/widgets/itemviews/editabletreemodel/CMakeLists.txt b/examples/widgets/itemviews/editabletreemodel/CMakeLists.txt index 5e8ce72f4d..8dfaf171be 100644 --- a/examples/widgets/itemviews/editabletreemodel/CMakeLists.txt +++ b/examples/widgets/itemviews/editabletreemodel/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from editabletreemodel.pro. - cmake_minimum_required(VERSION 3.16) project(editabletreemodel LANGUAGES CXX) diff --git a/examples/widgets/itemviews/fetchmore/CMakeLists.txt b/examples/widgets/itemviews/fetchmore/CMakeLists.txt index ada05c0af4..2ea49fd210 100644 --- a/examples/widgets/itemviews/fetchmore/CMakeLists.txt +++ b/examples/widgets/itemviews/fetchmore/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from fetchmore.pro. - cmake_minimum_required(VERSION 3.16) project(fetchmore LANGUAGES CXX) diff --git a/examples/widgets/itemviews/flattreeview/CMakeLists.txt b/examples/widgets/itemviews/flattreeview/CMakeLists.txt index 4768bcb204..c15fe84734 100644 --- a/examples/widgets/itemviews/flattreeview/CMakeLists.txt +++ b/examples/widgets/itemviews/flattreeview/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from flattreeview.pro. - cmake_minimum_required(VERSION 3.16) project(flattreeview LANGUAGES CXX) diff --git a/examples/widgets/itemviews/frozencolumn/CMakeLists.txt b/examples/widgets/itemviews/frozencolumn/CMakeLists.txt index 1fef5bf76c..6180a204ac 100644 --- a/examples/widgets/itemviews/frozencolumn/CMakeLists.txt +++ b/examples/widgets/itemviews/frozencolumn/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from frozencolumn.pro. - cmake_minimum_required(VERSION 3.16) project(frozencolumn LANGUAGES CXX) diff --git a/examples/widgets/itemviews/interview/CMakeLists.txt b/examples/widgets/itemviews/interview/CMakeLists.txt index 11cc25796e..9574b24d50 100644 --- a/examples/widgets/itemviews/interview/CMakeLists.txt +++ b/examples/widgets/itemviews/interview/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from interview.pro. - cmake_minimum_required(VERSION 3.16) project(interview LANGUAGES CXX) diff --git a/examples/widgets/itemviews/pixelator/CMakeLists.txt b/examples/widgets/itemviews/pixelator/CMakeLists.txt index 0126dce328..be4cb6afc1 100644 --- a/examples/widgets/itemviews/pixelator/CMakeLists.txt +++ b/examples/widgets/itemviews/pixelator/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from pixelator.pro. - cmake_minimum_required(VERSION 3.16) project(pixelator LANGUAGES CXX) diff --git a/examples/widgets/itemviews/puzzle/CMakeLists.txt b/examples/widgets/itemviews/puzzle/CMakeLists.txt index 9d6808a3d0..4761852664 100644 --- a/examples/widgets/itemviews/puzzle/CMakeLists.txt +++ b/examples/widgets/itemviews/puzzle/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from puzzle.pro. - cmake_minimum_required(VERSION 3.16) project(puzzle LANGUAGES CXX) @@ -17,17 +15,17 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/itemviews/puzzle") find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) -qt_add_executable(itemviews_puzzle # special case: renamed puzzle +qt_add_executable(itemviews_puzzle main.cpp mainwindow.cpp mainwindow.h piecesmodel.cpp piecesmodel.h puzzlewidget.cpp puzzlewidget.h ) -set_target_properties(itemviews_puzzle PROPERTIES # special case +set_target_properties(itemviews_puzzle PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) -target_link_libraries(itemviews_puzzle PUBLIC # special case +target_link_libraries(itemviews_puzzle PUBLIC Qt::Core Qt::Gui Qt::Widgets @@ -46,7 +44,7 @@ qt_add_resources(itemviews_puzzle "puzzle" ${puzzle_resource_files} ) -install(TARGETS itemviews_puzzle # special case: renamed puzzle +install(TARGETS itemviews_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 54034d90d6..47c26d1b2e 100644 --- a/examples/widgets/itemviews/simpledommodel/CMakeLists.txt +++ b/examples/widgets/itemviews/simpledommodel/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from simpledommodel.pro. - cmake_minimum_required(VERSION 3.16) project(simpledommodel LANGUAGES CXX) diff --git a/examples/widgets/itemviews/simpletreemodel/CMakeLists.txt b/examples/widgets/itemviews/simpletreemodel/CMakeLists.txt index f8e72a2a0e..f6d8aae118 100644 --- a/examples/widgets/itemviews/simpletreemodel/CMakeLists.txt +++ b/examples/widgets/itemviews/simpletreemodel/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from simpletreemodel.pro. - cmake_minimum_required(VERSION 3.16) project(simpletreemodel LANGUAGES CXX) diff --git a/examples/widgets/itemviews/simplewidgetmapper/CMakeLists.txt b/examples/widgets/itemviews/simplewidgetmapper/CMakeLists.txt index 1d0e400ac2..14ad9bd96c 100644 --- a/examples/widgets/itemviews/simplewidgetmapper/CMakeLists.txt +++ b/examples/widgets/itemviews/simplewidgetmapper/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from simplewidgetmapper.pro. - cmake_minimum_required(VERSION 3.16) project(simplewidgetmapper LANGUAGES CXX) diff --git a/examples/widgets/itemviews/spinboxdelegate/CMakeLists.txt b/examples/widgets/itemviews/spinboxdelegate/CMakeLists.txt index 794bac8c47..bcea33915c 100644 --- a/examples/widgets/itemviews/spinboxdelegate/CMakeLists.txt +++ b/examples/widgets/itemviews/spinboxdelegate/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from spinboxdelegate.pro. - cmake_minimum_required(VERSION 3.16) project(spinboxdelegate LANGUAGES CXX) diff --git a/examples/widgets/itemviews/spreadsheet/CMakeLists.txt b/examples/widgets/itemviews/spreadsheet/CMakeLists.txt index 8847cb96ee..e0089a0ed9 100644 --- a/examples/widgets/itemviews/spreadsheet/CMakeLists.txt +++ b/examples/widgets/itemviews/spreadsheet/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from spreadsheet.pro. - cmake_minimum_required(VERSION 3.16) project(spreadsheet LANGUAGES CXX) @@ -36,11 +34,10 @@ target_link_libraries(spreadsheet PUBLIC Qt::Gui Qt::Widgets ) -# special case begin + if (TARGET Qt::PrintSupport) target_link_libraries(spreadsheet PUBLIC Qt::PrintSupport) endif() -# special case end # Resources: diff --git a/examples/widgets/itemviews/stardelegate/CMakeLists.txt b/examples/widgets/itemviews/stardelegate/CMakeLists.txt index 3a03e105dd..136dc7c83d 100644 --- a/examples/widgets/itemviews/stardelegate/CMakeLists.txt +++ b/examples/widgets/itemviews/stardelegate/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from stardelegate.pro. - cmake_minimum_required(VERSION 3.16) project(stardelegate LANGUAGES CXX) diff --git a/examples/widgets/itemviews/storageview/CMakeLists.txt b/examples/widgets/itemviews/storageview/CMakeLists.txt index f1a77b2300..43a11e9f12 100644 --- a/examples/widgets/itemviews/storageview/CMakeLists.txt +++ b/examples/widgets/itemviews/storageview/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from storageview.pro. - cmake_minimum_required(VERSION 3.16) project(storageview LANGUAGES CXX) diff --git a/examples/widgets/layouts/CMakeLists.txt b/examples/widgets/layouts/CMakeLists.txt index 656b602650..1950c7f641 100644 --- a/examples/widgets/layouts/CMakeLists.txt +++ b/examples/widgets/layouts/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from layouts.pro. - qt_internal_add_example(basiclayouts) qt_internal_add_example(borderlayout) qt_internal_add_example(dynamiclayouts) diff --git a/examples/widgets/layouts/basiclayouts/CMakeLists.txt b/examples/widgets/layouts/basiclayouts/CMakeLists.txt index 4534b4ab30..52518163a1 100644 --- a/examples/widgets/layouts/basiclayouts/CMakeLists.txt +++ b/examples/widgets/layouts/basiclayouts/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from basiclayouts.pro. - cmake_minimum_required(VERSION 3.16) project(basiclayouts LANGUAGES CXX) diff --git a/examples/widgets/layouts/borderlayout/CMakeLists.txt b/examples/widgets/layouts/borderlayout/CMakeLists.txt index 7e9a035b06..3c04f1b66a 100644 --- a/examples/widgets/layouts/borderlayout/CMakeLists.txt +++ b/examples/widgets/layouts/borderlayout/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from borderlayout.pro. - cmake_minimum_required(VERSION 3.16) project(borderlayout LANGUAGES CXX) diff --git a/examples/widgets/layouts/dynamiclayouts/CMakeLists.txt b/examples/widgets/layouts/dynamiclayouts/CMakeLists.txt index c585dfd26d..565829c1c2 100644 --- a/examples/widgets/layouts/dynamiclayouts/CMakeLists.txt +++ b/examples/widgets/layouts/dynamiclayouts/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from dynamiclayouts.pro. - cmake_minimum_required(VERSION 3.16) project(dynamiclayouts LANGUAGES CXX) diff --git a/examples/widgets/layouts/flowlayout/CMakeLists.txt b/examples/widgets/layouts/flowlayout/CMakeLists.txt index 7e50135aff..c28668fb49 100644 --- a/examples/widgets/layouts/flowlayout/CMakeLists.txt +++ b/examples/widgets/layouts/flowlayout/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from flowlayout.pro. - cmake_minimum_required(VERSION 3.16) project(flowlayout LANGUAGES CXX) diff --git a/examples/widgets/mainwindows/CMakeLists.txt b/examples/widgets/mainwindows/CMakeLists.txt index ba87029ef8..60dbc59310 100644 --- a/examples/widgets/mainwindows/CMakeLists.txt +++ b/examples/widgets/mainwindows/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from mainwindows.pro. - qt_internal_add_example(application) qt_internal_add_example(dockwidgets) qt_internal_add_example(mainwindow) diff --git a/examples/widgets/mainwindows/application/CMakeLists.txt b/examples/widgets/mainwindows/application/CMakeLists.txt index debd65da83..262548a6e1 100644 --- a/examples/widgets/mainwindows/application/CMakeLists.txt +++ b/examples/widgets/mainwindows/application/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from application.pro. - cmake_minimum_required(VERSION 3.16) project(application LANGUAGES CXX) diff --git a/examples/widgets/mainwindows/dockwidgets/CMakeLists.txt b/examples/widgets/mainwindows/dockwidgets/CMakeLists.txt index 90eec8c509..5dff006c70 100644 --- a/examples/widgets/mainwindows/dockwidgets/CMakeLists.txt +++ b/examples/widgets/mainwindows/dockwidgets/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from dockwidgets.pro. - cmake_minimum_required(VERSION 3.16) project(dockwidgets LANGUAGES CXX) @@ -33,11 +31,10 @@ target_link_libraries(dockwidgets PUBLIC Qt::Gui Qt::Widgets ) -# special case begin + if (TARGET Qt::PrintSupport) target_link_libraries(dockwidgets PUBLIC Qt::PrintSupport) endif() -# special case end # Resources: diff --git a/examples/widgets/mainwindows/mainwindow/CMakeLists.txt b/examples/widgets/mainwindows/mainwindow/CMakeLists.txt index 33d367628a..ee04a59d94 100644 --- a/examples/widgets/mainwindows/mainwindow/CMakeLists.txt +++ b/examples/widgets/mainwindows/mainwindow/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from mainwindow.pro. - cmake_minimum_required(VERSION 3.16) project(mainwindow LANGUAGES CXX) diff --git a/examples/widgets/mainwindows/mdi/CMakeLists.txt b/examples/widgets/mainwindows/mdi/CMakeLists.txt index 038dabf996..7a2efef80f 100644 --- a/examples/widgets/mainwindows/mdi/CMakeLists.txt +++ b/examples/widgets/mainwindows/mdi/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from mdi.pro. - cmake_minimum_required(VERSION 3.16) project(mdi LANGUAGES CXX) diff --git a/examples/widgets/mainwindows/menus/CMakeLists.txt b/examples/widgets/mainwindows/menus/CMakeLists.txt index d97cc26724..ee5eb4e616 100644 --- a/examples/widgets/mainwindows/menus/CMakeLists.txt +++ b/examples/widgets/mainwindows/menus/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from menus.pro. - cmake_minimum_required(VERSION 3.16) project(menus LANGUAGES CXX) diff --git a/examples/widgets/mainwindows/sdi/CMakeLists.txt b/examples/widgets/mainwindows/sdi/CMakeLists.txt index 6f62c1e404..89b3228293 100644 --- a/examples/widgets/mainwindows/sdi/CMakeLists.txt +++ b/examples/widgets/mainwindows/sdi/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from sdi.pro. - cmake_minimum_required(VERSION 3.16) project(sdi LANGUAGES CXX) diff --git a/examples/widgets/painting/CMakeLists.txt b/examples/widgets/painting/CMakeLists.txt index 40ebafdc31..35f3af71b5 100644 --- a/examples/widgets/painting/CMakeLists.txt +++ b/examples/widgets/painting/CMakeLists.txt @@ -1,10 +1,7 @@ -# Generated from painting.pro. - -#add_subdirectory(shared) # special case pulled in by other subdirs as needed qt_internal_add_example(basicdrawing) qt_internal_add_example(concentriccircles) qt_internal_add_example(affine) -# qt_internal_add_example(composition) # special case FIXME: Seems buggy wrt. usesOpenGL function +# qt_internal_add_example(composition) # FIXME: Seems buggy wrt. usesOpenGL function qt_internal_add_example(deform) qt_internal_add_example(gradients) qt_internal_add_example(pathstroke) diff --git a/examples/widgets/painting/affine/CMakeLists.txt b/examples/widgets/painting/affine/CMakeLists.txt index dbc38202c2..88792be8f0 100644 --- a/examples/widgets/painting/affine/CMakeLists.txt +++ b/examples/widgets/painting/affine/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from affine.pro. - cmake_minimum_required(VERSION 3.16) project(affine LANGUAGES CXX) @@ -18,12 +16,10 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/painting/affine") find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) qt_add_executable(affine - # special case begin # remove files from ../shared #../shared/arthurstyle.cpp ../shared/arthurstyle.h #../shared/arthurwidgets.cpp ../shared/arthurwidgets.h #../shared/hoverpoints.cpp ../shared/hoverpoints.h - # special case end main.cpp xform.cpp xform.h ) @@ -35,17 +31,15 @@ target_include_directories(affine PUBLIC ../shared ) -# special case begin if(NOT TARGET painting_shared::painting_shared) include(../shared/use_lib.cmake) endif() -# special case end target_link_libraries(affine PUBLIC Qt::Core Qt::Gui Qt::Widgets - painting_shared::painting_shared # special case + painting_shared::painting_shared ) @@ -109,7 +103,6 @@ qt_add_resources(affine "affine" ${affine_resource_files} ) -# special case begin # remove files from ../shared #if(QT_FEATURE_opengl) #target_sources(affine PUBLIC @@ -120,7 +113,6 @@ qt_add_resources(affine "affine" #Qt::OpenGL #) #endif() -# special case end install(TARGETS affine RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/widgets/painting/basicdrawing/CMakeLists.txt b/examples/widgets/painting/basicdrawing/CMakeLists.txt index a4778edbc1..83faca559e 100644 --- a/examples/widgets/painting/basicdrawing/CMakeLists.txt +++ b/examples/widgets/painting/basicdrawing/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from basicdrawing.pro. - cmake_minimum_required(VERSION 3.16) project(basicdrawing LANGUAGES CXX) diff --git a/examples/widgets/painting/composition/CMakeLists.txt b/examples/widgets/painting/composition/CMakeLists.txt index 3e48a688fa..62156d45e4 100644 --- a/examples/widgets/painting/composition/CMakeLists.txt +++ b/examples/widgets/painting/composition/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from composition.pro. - cmake_minimum_required(VERSION 3.16) project(composition LANGUAGES CXX) @@ -18,12 +16,10 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/painting/composition") find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) qt_add_executable(composition - # special case begin # remove files from ../shared #../shared/arthurstyle.cpp ../shared/arthurstyle.h #../shared/arthurwidgets.cpp ../shared/arthurwidgets.h #../shared/hoverpoints.cpp ../shared/hoverpoints.h - # special case end composition.cpp composition.h main.cpp ) @@ -35,17 +31,15 @@ target_include_directories(composition PUBLIC ../shared ) -# special case begin if(NOT TARGET painting_shared::painting_shared) include(../shared/use_lib.cmake) endif() -# special case end target_link_libraries(composition PUBLIC Qt::Core Qt::Gui Qt::Widgets - painting_shared::painting_shared # special case + painting_shared::painting_shared ) @@ -110,7 +104,6 @@ qt_add_resources(composition "composition" ${composition_resource_files} ) -# special case begin # remove files from ../shared #if(QT_FEATURE_opengl) #target_sources(affine PUBLIC @@ -121,7 +114,6 @@ qt_add_resources(composition "composition" #Qt::OpenGL #) #endif() -# special case end install(TARGETS composition RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/widgets/painting/concentriccircles/CMakeLists.txt b/examples/widgets/painting/concentriccircles/CMakeLists.txt index 7bc7b44deb..72ed7d8776 100644 --- a/examples/widgets/painting/concentriccircles/CMakeLists.txt +++ b/examples/widgets/painting/concentriccircles/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from concentriccircles.pro. - cmake_minimum_required(VERSION 3.16) project(concentriccircles LANGUAGES CXX) diff --git a/examples/widgets/painting/deform/CMakeLists.txt b/examples/widgets/painting/deform/CMakeLists.txt index feadb84a6a..1174cf5a27 100644 --- a/examples/widgets/painting/deform/CMakeLists.txt +++ b/examples/widgets/painting/deform/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from deform.pro. - cmake_minimum_required(VERSION 3.16) project(deform LANGUAGES CXX) @@ -18,12 +16,10 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/painting/deform") find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) qt_add_executable(deform - # special case begin # remove files from ../shared #../shared/arthurstyle.cpp ../shared/arthurstyle.h #../shared/arthurwidgets.cpp ../shared/arthurwidgets.h #../shared/hoverpoints.cpp ../shared/hoverpoints.h - # special case end main.cpp pathdeform.cpp pathdeform.h ) @@ -35,17 +31,15 @@ target_include_directories(deform PUBLIC ../shared ) -# special case begin if(NOT TARGET painting_shared::painting_shared) include(../shared/use_lib.cmake) endif() -# special case end target_link_libraries(deform PUBLIC Qt::Core Qt::Gui Qt::Widgets - painting_shared::painting_shared # special case + painting_shared::painting_shared ) @@ -108,7 +102,6 @@ qt_add_resources(deform "deform" ${deform_resource_files} ) -# special case begin # remove files from ../shared #if(QT_FEATURE_opengl) #target_sources(affine PUBLIC @@ -119,7 +112,6 @@ qt_add_resources(deform "deform" #Qt::OpenGL #) #endif() -# special case end install(TARGETS deform RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/widgets/painting/fontsampler/CMakeLists.txt b/examples/widgets/painting/fontsampler/CMakeLists.txt index cb04d523bd..e0b683ba33 100644 --- a/examples/widgets/painting/fontsampler/CMakeLists.txt +++ b/examples/widgets/painting/fontsampler/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from fontsampler.pro. - cmake_minimum_required(VERSION 3.16) project(fontsampler LANGUAGES CXX) diff --git a/examples/widgets/painting/gradients/CMakeLists.txt b/examples/widgets/painting/gradients/CMakeLists.txt index 62dca0045d..6de1d3c47e 100644 --- a/examples/widgets/painting/gradients/CMakeLists.txt +++ b/examples/widgets/painting/gradients/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from gradients.pro. - cmake_minimum_required(VERSION 3.16) project(gradients LANGUAGES CXX) @@ -18,12 +16,10 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/painting/gradients") find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) qt_add_executable(gradients - # special case begin # remove files from ../shared #../shared/arthurstyle.cpp ../shared/arthurstyle.h #../shared/arthurwidgets.cpp ../shared/arthurwidgets.h #../shared/hoverpoints.cpp ../shared/hoverpoints.h - # special case end gradients.cpp gradients.h main.cpp ) @@ -35,17 +31,15 @@ target_include_directories(gradients PUBLIC ../shared ) -# special case begin if(NOT TARGET painting_shared::painting_shared) include(../shared/use_lib.cmake) endif() -# special case end target_link_libraries(gradients PUBLIC Qt::Core Qt::Gui Qt::Widgets - painting_shared::painting_shared # special case + painting_shared::painting_shared ) @@ -108,7 +102,6 @@ qt_add_resources(gradients "gradients" ${gradients_resource_files} ) -# special case begin # remove files from ../shared #if(QT_FEATURE_opengl) #target_sources(affine PUBLIC @@ -119,7 +112,6 @@ qt_add_resources(gradients "gradients" #Qt::OpenGL #) #endif() -# special case end install(TARGETS gradients RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/widgets/painting/imagecomposition/CMakeLists.txt b/examples/widgets/painting/imagecomposition/CMakeLists.txt index 4df69207f2..2887d84002 100644 --- a/examples/widgets/painting/imagecomposition/CMakeLists.txt +++ b/examples/widgets/painting/imagecomposition/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from imagecomposition.pro. - cmake_minimum_required(VERSION 3.16) project(imagecomposition LANGUAGES CXX) diff --git a/examples/widgets/painting/painterpaths/CMakeLists.txt b/examples/widgets/painting/painterpaths/CMakeLists.txt index 6e8492d8c3..f4530521dc 100644 --- a/examples/widgets/painting/painterpaths/CMakeLists.txt +++ b/examples/widgets/painting/painterpaths/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from painterpaths.pro. - cmake_minimum_required(VERSION 3.16) project(painterpaths LANGUAGES CXX) diff --git a/examples/widgets/painting/pathstroke/CMakeLists.txt b/examples/widgets/painting/pathstroke/CMakeLists.txt index 8c84afcb6e..9e28706529 100644 --- a/examples/widgets/painting/pathstroke/CMakeLists.txt +++ b/examples/widgets/painting/pathstroke/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from pathstroke.pro. - cmake_minimum_required(VERSION 3.16) project(pathstroke LANGUAGES CXX) @@ -18,12 +16,10 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/painting/pathstroke") find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) qt_add_executable(pathstroke - # special case begin # remove files from ../shared #../shared/arthurstyle.cpp ../shared/arthurstyle.h #../shared/arthurwidgets.cpp ../shared/arthurwidgets.h #../shared/hoverpoints.cpp ../shared/hoverpoints.h - # special case end main.cpp pathstroke.cpp pathstroke.h ) @@ -35,17 +31,15 @@ target_include_directories(pathstroke PUBLIC ../shared ) -# special case begin if(NOT TARGET painting_shared::painting_shared) include(../shared/use_lib.cmake) endif() -# special case end target_link_libraries(pathstroke PUBLIC Qt::Core Qt::Gui Qt::Widgets - painting_shared::painting_shared # special case + painting_shared::painting_shared ) @@ -108,7 +102,6 @@ qt_add_resources(pathstroke "pathstroke" ${pathstroke_resource_files} ) -# special case begin # remove files from ../shared #if(QT_FEATURE_opengl) #target_sources(affine PUBLIC @@ -119,7 +112,6 @@ qt_add_resources(pathstroke "pathstroke" #Qt::OpenGL #) #endif() -# special case end install(TARGETS pathstroke RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/widgets/painting/shared/CMakeLists.txt b/examples/widgets/painting/shared/CMakeLists.txt index 0fc65d3d99..bd1b2ef5c6 100644 --- a/examples/widgets/painting/shared/CMakeLists.txt +++ b/examples/widgets/painting/shared/CMakeLists.txt @@ -1,6 +1,3 @@ -# special case skip regeneration -# Port of shared.pri to be included by painting examples - add_library(painting_shared OBJECT) add_library(painting_shared::painting_shared ALIAS painting_shared) qt6_wrap_cpp(moc_files arthurwidgets.h hoverpoints.h) # no automoc for OBJECT libs:-/ diff --git a/examples/widgets/painting/transformations/CMakeLists.txt b/examples/widgets/painting/transformations/CMakeLists.txt index 20b6af6a63..990871318f 100644 --- a/examples/widgets/painting/transformations/CMakeLists.txt +++ b/examples/widgets/painting/transformations/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from transformations.pro. - cmake_minimum_required(VERSION 3.16) project(transformations LANGUAGES CXX) diff --git a/examples/widgets/richtext/CMakeLists.txt b/examples/widgets/richtext/CMakeLists.txt index 86bbcccea5..cb49c61fa6 100644 --- a/examples/widgets/richtext/CMakeLists.txt +++ b/examples/widgets/richtext/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from richtext.pro. - qt_internal_add_example(calendar) qt_internal_add_example(orderform) qt_internal_add_example(syntaxhighlighter) diff --git a/examples/widgets/richtext/calendar/CMakeLists.txt b/examples/widgets/richtext/calendar/CMakeLists.txt index c3e777dddb..c883b30dcc 100644 --- a/examples/widgets/richtext/calendar/CMakeLists.txt +++ b/examples/widgets/richtext/calendar/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from calendar.pro. - cmake_minimum_required(VERSION 3.16) project(calendar LANGUAGES CXX) diff --git a/examples/widgets/richtext/orderform/CMakeLists.txt b/examples/widgets/richtext/orderform/CMakeLists.txt index c47a71fdcd..32646d7b59 100644 --- a/examples/widgets/richtext/orderform/CMakeLists.txt +++ b/examples/widgets/richtext/orderform/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from orderform.pro. - cmake_minimum_required(VERSION 3.16) project(orderform LANGUAGES CXX) diff --git a/examples/widgets/richtext/syntaxhighlighter/CMakeLists.txt b/examples/widgets/richtext/syntaxhighlighter/CMakeLists.txt index 4132c06ef6..d9a20cccd4 100644 --- a/examples/widgets/richtext/syntaxhighlighter/CMakeLists.txt +++ b/examples/widgets/richtext/syntaxhighlighter/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from syntaxhighlighter.pro. - cmake_minimum_required(VERSION 3.16) project(syntaxhighlighter LANGUAGES CXX) diff --git a/examples/widgets/richtext/textedit/CMakeLists.txt b/examples/widgets/richtext/textedit/CMakeLists.txt index 7190e8d5b1..3a29d09a61 100644 --- a/examples/widgets/richtext/textedit/CMakeLists.txt +++ b/examples/widgets/richtext/textedit/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from textedit.pro. - cmake_minimum_required(VERSION 3.16) project(textedit LANGUAGES CXX) @@ -33,11 +31,10 @@ target_link_libraries(textedit PUBLIC Qt::Gui Qt::Widgets ) -# special case begin + if (TARGET Qt::PrintSupport) target_link_libraries(textedit PUBLIC Qt::PrintSupport) endif() -# special case end # Resources: diff --git a/examples/widgets/scroller/CMakeLists.txt b/examples/widgets/scroller/CMakeLists.txt index 37ee7ea08f..fb9ebc2848 100644 --- a/examples/widgets/scroller/CMakeLists.txt +++ b/examples/widgets/scroller/CMakeLists.txt @@ -1,3 +1 @@ -# Generated from scroller.pro. - qt_internal_add_example(graphicsview) diff --git a/examples/widgets/scroller/graphicsview/CMakeLists.txt b/examples/widgets/scroller/graphicsview/CMakeLists.txt index d835b72eb8..5f768c8694 100644 --- a/examples/widgets/scroller/graphicsview/CMakeLists.txt +++ b/examples/widgets/scroller/graphicsview/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from graphicsview.pro. - cmake_minimum_required(VERSION 3.16) project(graphicsview LANGUAGES CXX) diff --git a/examples/widgets/tools/CMakeLists.txt b/examples/widgets/tools/CMakeLists.txt index 0056518f1e..136097ddf3 100644 --- a/examples/widgets/tools/CMakeLists.txt +++ b/examples/widgets/tools/CMakeLists.txt @@ -1,8 +1,6 @@ -# Generated from tools.pro. - qt_internal_add_example(completer) qt_internal_add_example(customcompleter) -if(QT_FEATURE_translation) # special case +if(QT_FEATURE_translation) qt_internal_add_example(i18n) endif() qt_internal_add_example(regularexpression) @@ -12,11 +10,10 @@ qt_internal_add_example(treemodelcompleter) qt_internal_add_example(undo) qt_internal_add_example(undoframework) -if(QT_FEATURE_library) # special case +if(QT_FEATURE_library) add_subdirectory(echoplugin) - # special case begin + if(QT_FEATURE_inputdialog) qt_internal_add_example(plugandpaint) endif() - # special case end endif() diff --git a/examples/widgets/tools/completer/CMakeLists.txt b/examples/widgets/tools/completer/CMakeLists.txt index cbcf19421c..8ec960dafd 100644 --- a/examples/widgets/tools/completer/CMakeLists.txt +++ b/examples/widgets/tools/completer/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from completer.pro. - cmake_minimum_required(VERSION 3.16) project(completer LANGUAGES CXX) diff --git a/examples/widgets/tools/customcompleter/CMakeLists.txt b/examples/widgets/tools/customcompleter/CMakeLists.txt index cb26eb1c79..9e0bbee241 100644 --- a/examples/widgets/tools/customcompleter/CMakeLists.txt +++ b/examples/widgets/tools/customcompleter/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from customcompleter.pro. - cmake_minimum_required(VERSION 3.16) project(customcompleter LANGUAGES CXX) diff --git a/examples/widgets/tools/i18n/CMakeLists.txt b/examples/widgets/tools/i18n/CMakeLists.txt index 2d8c3a21d9..0cb230a805 100644 --- a/examples/widgets/tools/i18n/CMakeLists.txt +++ b/examples/widgets/tools/i18n/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from i18n.pro. - cmake_minimum_required(VERSION 3.16) project(i18n LANGUAGES CXX) diff --git a/examples/widgets/tools/regularexpression/CMakeLists.txt b/examples/widgets/tools/regularexpression/CMakeLists.txt index 4d2be816a5..85f9a81156 100644 --- a/examples/widgets/tools/regularexpression/CMakeLists.txt +++ b/examples/widgets/tools/regularexpression/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from regularexpression.pro. - cmake_minimum_required(VERSION 3.16) project(regularexpression LANGUAGES CXX) diff --git a/examples/widgets/tools/settingseditor/CMakeLists.txt b/examples/widgets/tools/settingseditor/CMakeLists.txt index 7f8bcca593..e1b6f95eb5 100644 --- a/examples/widgets/tools/settingseditor/CMakeLists.txt +++ b/examples/widgets/tools/settingseditor/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from settingseditor.pro. - cmake_minimum_required(VERSION 3.16) project(settingseditor LANGUAGES CXX) diff --git a/examples/widgets/tools/treemodelcompleter/CMakeLists.txt b/examples/widgets/tools/treemodelcompleter/CMakeLists.txt index 5e094b381e..1e641fc5b2 100644 --- a/examples/widgets/tools/treemodelcompleter/CMakeLists.txt +++ b/examples/widgets/tools/treemodelcompleter/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from treemodelcompleter.pro. - cmake_minimum_required(VERSION 3.16) project(treemodelcompleter LANGUAGES CXX) diff --git a/examples/widgets/tools/undo/CMakeLists.txt b/examples/widgets/tools/undo/CMakeLists.txt index 0a842715e5..113b3b5a6d 100644 --- a/examples/widgets/tools/undo/CMakeLists.txt +++ b/examples/widgets/tools/undo/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from undo.pro. - cmake_minimum_required(VERSION 3.16) project(undo LANGUAGES CXX) diff --git a/examples/widgets/tools/undoframework/CMakeLists.txt b/examples/widgets/tools/undoframework/CMakeLists.txt index b54e5a01a7..c142f5d863 100644 --- a/examples/widgets/tools/undoframework/CMakeLists.txt +++ b/examples/widgets/tools/undoframework/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from undoframework.pro. - cmake_minimum_required(VERSION 3.16) project(undoframework LANGUAGES CXX) diff --git a/examples/widgets/touch/CMakeLists.txt b/examples/widgets/touch/CMakeLists.txt index ca6ef7fcb8..96d46484b6 100644 --- a/examples/widgets/touch/CMakeLists.txt +++ b/examples/widgets/touch/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from touch.pro. - if(NOT TARGET Qt::Widgets) return() endif() diff --git a/examples/widgets/touch/dials/CMakeLists.txt b/examples/widgets/touch/dials/CMakeLists.txt index 804ed5dccd..a7a6153631 100644 --- a/examples/widgets/touch/dials/CMakeLists.txt +++ b/examples/widgets/touch/dials/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from dials.pro. - cmake_minimum_required(VERSION 3.16) project(dials LANGUAGES CXX) diff --git a/examples/widgets/touch/fingerpaint/CMakeLists.txt b/examples/widgets/touch/fingerpaint/CMakeLists.txt index 308b34c6af..f2ed4be8df 100644 --- a/examples/widgets/touch/fingerpaint/CMakeLists.txt +++ b/examples/widgets/touch/fingerpaint/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from fingerpaint.pro. - cmake_minimum_required(VERSION 3.16) project(fingerpaint LANGUAGES CXX) @@ -34,11 +32,10 @@ target_link_libraries(fingerpaint PUBLIC Qt::Gui Qt::Widgets ) -# special case begin + if (TARGET Qt::PrintSupport) target_link_libraries(fingerpaint PUBLIC Qt::PrintSupport) endif() -# special case end if(TARGET Qt::PrintSupport) target_link_libraries(fingerpaint PUBLIC diff --git a/examples/widgets/touch/knobs/CMakeLists.txt b/examples/widgets/touch/knobs/CMakeLists.txt index f13978784d..f92bb52a59 100644 --- a/examples/widgets/touch/knobs/CMakeLists.txt +++ b/examples/widgets/touch/knobs/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from knobs.pro. - cmake_minimum_required(VERSION 3.16) project(knobs LANGUAGES CXX) diff --git a/examples/widgets/touch/pinchzoom/CMakeLists.txt b/examples/widgets/touch/pinchzoom/CMakeLists.txt index 8d67cfffe3..19a9fe6c67 100644 --- a/examples/widgets/touch/pinchzoom/CMakeLists.txt +++ b/examples/widgets/touch/pinchzoom/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from pinchzoom.pro. - cmake_minimum_required(VERSION 3.16) project(pinchzoom LANGUAGES CXX) diff --git a/examples/widgets/tutorials/CMakeLists.txt b/examples/widgets/tutorials/CMakeLists.txt index 733eb42151..091bf7109b 100644 --- a/examples/widgets/tutorials/CMakeLists.txt +++ b/examples/widgets/tutorials/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from tutorials.pro. - add_subdirectory(addressbook) add_subdirectory(widgets) add_subdirectory(modelview) diff --git a/examples/widgets/tutorials/addressbook/CMakeLists.txt b/examples/widgets/tutorials/addressbook/CMakeLists.txt index cb00cbc084..1d8a65bb0b 100644 --- a/examples/widgets/tutorials/addressbook/CMakeLists.txt +++ b/examples/widgets/tutorials/addressbook/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from addressbook.pro. - qt_internal_add_example(part1) qt_internal_add_example(part2) qt_internal_add_example(part3) diff --git a/examples/widgets/tutorials/addressbook/part1/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part1/CMakeLists.txt index ce75121bbc..c7f30def59 100644 --- a/examples/widgets/tutorials/addressbook/part1/CMakeLists.txt +++ b/examples/widgets/tutorials/addressbook/part1/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from part1.pro. - cmake_minimum_required(VERSION 3.16) project(part1 LANGUAGES CXX) diff --git a/examples/widgets/tutorials/addressbook/part2/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part2/CMakeLists.txt index 8dc9f1c4f8..9cb1ff02a9 100644 --- a/examples/widgets/tutorials/addressbook/part2/CMakeLists.txt +++ b/examples/widgets/tutorials/addressbook/part2/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from part2.pro. - cmake_minimum_required(VERSION 3.16) project(part2 LANGUAGES CXX) diff --git a/examples/widgets/tutorials/addressbook/part3/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part3/CMakeLists.txt index d6dd2791e4..56385d9d25 100644 --- a/examples/widgets/tutorials/addressbook/part3/CMakeLists.txt +++ b/examples/widgets/tutorials/addressbook/part3/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from part3.pro. - cmake_minimum_required(VERSION 3.16) project(part3 LANGUAGES CXX) diff --git a/examples/widgets/tutorials/addressbook/part4/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part4/CMakeLists.txt index 5d99531f18..cf99c3b801 100644 --- a/examples/widgets/tutorials/addressbook/part4/CMakeLists.txt +++ b/examples/widgets/tutorials/addressbook/part4/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from part4.pro. - cmake_minimum_required(VERSION 3.16) project(part4 LANGUAGES CXX) diff --git a/examples/widgets/tutorials/addressbook/part5/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part5/CMakeLists.txt index 3d908afc89..96ac3257d7 100644 --- a/examples/widgets/tutorials/addressbook/part5/CMakeLists.txt +++ b/examples/widgets/tutorials/addressbook/part5/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from part5.pro. - cmake_minimum_required(VERSION 3.16) project(part5 LANGUAGES CXX) diff --git a/examples/widgets/tutorials/addressbook/part6/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part6/CMakeLists.txt index fb96f8b19e..673996b9a5 100644 --- a/examples/widgets/tutorials/addressbook/part6/CMakeLists.txt +++ b/examples/widgets/tutorials/addressbook/part6/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from part6.pro. - cmake_minimum_required(VERSION 3.16) project(part6 LANGUAGES CXX) diff --git a/examples/widgets/tutorials/addressbook/part7/CMakeLists.txt b/examples/widgets/tutorials/addressbook/part7/CMakeLists.txt index 9e45e5cdbb..41a89a2753 100644 --- a/examples/widgets/tutorials/addressbook/part7/CMakeLists.txt +++ b/examples/widgets/tutorials/addressbook/part7/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from part7.pro. - cmake_minimum_required(VERSION 3.16) project(part7 LANGUAGES CXX) diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/CMakeLists.txt index 8302fd7598..6ceae61bce 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/CMakeLists.txt +++ b/examples/widgets/tutorials/gettingStarted/gsQt/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from gsqt.pro. - qt_internal_add_example(part1) qt_internal_add_example(part2) qt_internal_add_example(part3) diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part1/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/part1/CMakeLists.txt index 724f8110cd..97bd513ef5 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part1/CMakeLists.txt +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part1/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from part1.pro. - cmake_minimum_required(VERSION 3.16) project(getting_started_part1 LANGUAGES CXX) diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part2/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/part2/CMakeLists.txt index d089e48b54..c10322046b 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part2/CMakeLists.txt +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part2/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from part2.pro. - cmake_minimum_required(VERSION 3.16) project(getting_started_part2 LANGUAGES CXX) diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part3/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/part3/CMakeLists.txt index 2e9a5c5dae..d5e5dfb603 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part3/CMakeLists.txt +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part3/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from part3.pro. - cmake_minimum_required(VERSION 3.16) project(getting_started_part3 LANGUAGES CXX) diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part4/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/part4/CMakeLists.txt index c3b37ee43b..6531bce71c 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part4/CMakeLists.txt +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part4/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from part4.pro. - cmake_minimum_required(VERSION 3.16) project(getting_started_part4 LANGUAGES CXX) diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part5/CMakeLists.txt b/examples/widgets/tutorials/gettingStarted/gsQt/part5/CMakeLists.txt index 62572c2f76..1cdc84dd71 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part5/CMakeLists.txt +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part5/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from part5.pro. - cmake_minimum_required(VERSION 3.16) project(getting_started_part5 LANGUAGES CXX) diff --git a/examples/widgets/tutorials/modelview/1_readonly/CMakeLists.txt b/examples/widgets/tutorials/modelview/1_readonly/CMakeLists.txt index b8fa96f996..045e6409d6 100644 --- a/examples/widgets/tutorials/modelview/1_readonly/CMakeLists.txt +++ b/examples/widgets/tutorials/modelview/1_readonly/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from 1_readonly.pro. - cmake_minimum_required(VERSION 3.16) project(mv_readonly LANGUAGES CXX) diff --git a/examples/widgets/tutorials/modelview/2_formatting/CMakeLists.txt b/examples/widgets/tutorials/modelview/2_formatting/CMakeLists.txt index 2a77358e7a..c3e9a29d54 100644 --- a/examples/widgets/tutorials/modelview/2_formatting/CMakeLists.txt +++ b/examples/widgets/tutorials/modelview/2_formatting/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from 2_formatting.pro. - cmake_minimum_required(VERSION 3.16) project(mv_formatting LANGUAGES CXX) diff --git a/examples/widgets/tutorials/modelview/3_changingmodel/CMakeLists.txt b/examples/widgets/tutorials/modelview/3_changingmodel/CMakeLists.txt index e9563715bc..b8a4c9ba1f 100644 --- a/examples/widgets/tutorials/modelview/3_changingmodel/CMakeLists.txt +++ b/examples/widgets/tutorials/modelview/3_changingmodel/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from 3_changingmodel.pro. - cmake_minimum_required(VERSION 3.16) project(mv_changingmodel LANGUAGES CXX) diff --git a/examples/widgets/tutorials/modelview/4_headers/CMakeLists.txt b/examples/widgets/tutorials/modelview/4_headers/CMakeLists.txt index 7a771eb267..80d55f3096 100644 --- a/examples/widgets/tutorials/modelview/4_headers/CMakeLists.txt +++ b/examples/widgets/tutorials/modelview/4_headers/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from 4_headers.pro. - cmake_minimum_required(VERSION 3.16) project(mv_headers LANGUAGES CXX) diff --git a/examples/widgets/tutorials/modelview/5_edit/CMakeLists.txt b/examples/widgets/tutorials/modelview/5_edit/CMakeLists.txt index a5ba3021ae..61cffe039f 100644 --- a/examples/widgets/tutorials/modelview/5_edit/CMakeLists.txt +++ b/examples/widgets/tutorials/modelview/5_edit/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from 5_edit.pro. - cmake_minimum_required(VERSION 3.16) project(mv_edit LANGUAGES CXX) diff --git a/examples/widgets/tutorials/modelview/6_treeview/CMakeLists.txt b/examples/widgets/tutorials/modelview/6_treeview/CMakeLists.txt index ac94572754..b4ba1d7256 100644 --- a/examples/widgets/tutorials/modelview/6_treeview/CMakeLists.txt +++ b/examples/widgets/tutorials/modelview/6_treeview/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from 6_treeview.pro. - cmake_minimum_required(VERSION 3.16) project(mv_tree LANGUAGES CXX) diff --git a/examples/widgets/tutorials/modelview/7_selections/CMakeLists.txt b/examples/widgets/tutorials/modelview/7_selections/CMakeLists.txt index bf9e8197eb..aef8718e5f 100644 --- a/examples/widgets/tutorials/modelview/7_selections/CMakeLists.txt +++ b/examples/widgets/tutorials/modelview/7_selections/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from 7_selections.pro. - cmake_minimum_required(VERSION 3.16) project(mv_selections LANGUAGES CXX) diff --git a/examples/widgets/tutorials/modelview/CMakeLists.txt b/examples/widgets/tutorials/modelview/CMakeLists.txt index 49ca672e48..889b07b8da 100644 --- a/examples/widgets/tutorials/modelview/CMakeLists.txt +++ b/examples/widgets/tutorials/modelview/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from modelview.pro. - qt_internal_add_example(1_readonly) qt_internal_add_example(2_formatting) qt_internal_add_example(3_changingmodel) diff --git a/examples/widgets/tutorials/notepad/CMakeLists.txt b/examples/widgets/tutorials/notepad/CMakeLists.txt index e8d24a7181..aa11c84a6b 100644 --- a/examples/widgets/tutorials/notepad/CMakeLists.txt +++ b/examples/widgets/tutorials/notepad/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from notepad.pro. - cmake_minimum_required(VERSION 3.16) project(notepad LANGUAGES CXX) diff --git a/examples/widgets/tutorials/widgets/CMakeLists.txt b/examples/widgets/tutorials/widgets/CMakeLists.txt index fcf0ed9ddd..2898f65da8 100644 --- a/examples/widgets/tutorials/widgets/CMakeLists.txt +++ b/examples/widgets/tutorials/widgets/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from widgets.pro. - qt_internal_add_example(toplevel) qt_internal_add_example(childwidget) qt_internal_add_example(windowlayout) diff --git a/examples/widgets/tutorials/widgets/childwidget/CMakeLists.txt b/examples/widgets/tutorials/widgets/childwidget/CMakeLists.txt index c85862cd01..e88197dc95 100644 --- a/examples/widgets/tutorials/widgets/childwidget/CMakeLists.txt +++ b/examples/widgets/tutorials/widgets/childwidget/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from childwidget.pro. - cmake_minimum_required(VERSION 3.16) project(childwidget LANGUAGES CXX) diff --git a/examples/widgets/tutorials/widgets/nestedlayouts/CMakeLists.txt b/examples/widgets/tutorials/widgets/nestedlayouts/CMakeLists.txt index ad48b1eed3..e3b31cfa4e 100644 --- a/examples/widgets/tutorials/widgets/nestedlayouts/CMakeLists.txt +++ b/examples/widgets/tutorials/widgets/nestedlayouts/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from nestedlayouts.pro. - cmake_minimum_required(VERSION 3.16) project(nestedlayouts LANGUAGES CXX) diff --git a/examples/widgets/tutorials/widgets/toplevel/CMakeLists.txt b/examples/widgets/tutorials/widgets/toplevel/CMakeLists.txt index 82d15bc3c5..14bd7a63fa 100644 --- a/examples/widgets/tutorials/widgets/toplevel/CMakeLists.txt +++ b/examples/widgets/tutorials/widgets/toplevel/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from toplevel.pro. - cmake_minimum_required(VERSION 3.16) project(toplevel LANGUAGES CXX) diff --git a/examples/widgets/tutorials/widgets/windowlayout/CMakeLists.txt b/examples/widgets/tutorials/widgets/windowlayout/CMakeLists.txt index e566af85a5..ae8b995868 100644 --- a/examples/widgets/tutorials/widgets/windowlayout/CMakeLists.txt +++ b/examples/widgets/tutorials/widgets/windowlayout/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from windowlayout.pro. - cmake_minimum_required(VERSION 3.16) project(windowlayout LANGUAGES CXX) diff --git a/examples/widgets/widgets/CMakeLists.txt b/examples/widgets/widgets/CMakeLists.txt index 34d3d28b67..25912d2ec0 100644 --- a/examples/widgets/widgets/CMakeLists.txt +++ b/examples/widgets/widgets/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from widgets.pro. - qt_internal_add_example(analogclock) qt_internal_add_example(calculator) qt_internal_add_example(calendarwidget) diff --git a/examples/widgets/widgets/analogclock/CMakeLists.txt b/examples/widgets/widgets/analogclock/CMakeLists.txt index f972359e1a..b775b23485 100644 --- a/examples/widgets/widgets/analogclock/CMakeLists.txt +++ b/examples/widgets/widgets/analogclock/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from analogclock.pro. - cmake_minimum_required(VERSION 3.16) project(analogclock LANGUAGES CXX) diff --git a/examples/widgets/widgets/calculator/CMakeLists.txt b/examples/widgets/widgets/calculator/CMakeLists.txt index 7332c3b5ca..419e4e3bd1 100644 --- a/examples/widgets/widgets/calculator/CMakeLists.txt +++ b/examples/widgets/widgets/calculator/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from calculator.pro. - cmake_minimum_required(VERSION 3.16) project(calculator LANGUAGES CXX) diff --git a/examples/widgets/widgets/calendarwidget/CMakeLists.txt b/examples/widgets/widgets/calendarwidget/CMakeLists.txt index f95f2f9131..b1ee4577f1 100644 --- a/examples/widgets/widgets/calendarwidget/CMakeLists.txt +++ b/examples/widgets/widgets/calendarwidget/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from calendarwidget.pro. - cmake_minimum_required(VERSION 3.16) project(calendarwidget LANGUAGES CXX) diff --git a/examples/widgets/widgets/charactermap/CMakeLists.txt b/examples/widgets/widgets/charactermap/CMakeLists.txt index 4bb71104dd..65956f7afd 100644 --- a/examples/widgets/widgets/charactermap/CMakeLists.txt +++ b/examples/widgets/widgets/charactermap/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from charactermap.pro. - cmake_minimum_required(VERSION 3.16) project(charactermap LANGUAGES CXX) diff --git a/examples/widgets/widgets/codeeditor/CMakeLists.txt b/examples/widgets/widgets/codeeditor/CMakeLists.txt index f5c843933b..9eb4f1a8bd 100644 --- a/examples/widgets/widgets/codeeditor/CMakeLists.txt +++ b/examples/widgets/widgets/codeeditor/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from codeeditor.pro. - cmake_minimum_required(VERSION 3.16) project(codeeditor LANGUAGES CXX) diff --git a/examples/widgets/widgets/digitalclock/CMakeLists.txt b/examples/widgets/widgets/digitalclock/CMakeLists.txt index 684da7f24d..e2e1c4a1e3 100644 --- a/examples/widgets/widgets/digitalclock/CMakeLists.txt +++ b/examples/widgets/widgets/digitalclock/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from digitalclock.pro. - cmake_minimum_required(VERSION 3.16) project(digitalclock LANGUAGES CXX) diff --git a/examples/widgets/widgets/elidedlabel/CMakeLists.txt b/examples/widgets/widgets/elidedlabel/CMakeLists.txt index e6b0a02c1b..feb46d9720 100644 --- a/examples/widgets/widgets/elidedlabel/CMakeLists.txt +++ b/examples/widgets/widgets/elidedlabel/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from elidedlabel.pro. - cmake_minimum_required(VERSION 3.16) project(elidedlabel LANGUAGES CXX) diff --git a/examples/widgets/widgets/groupbox/CMakeLists.txt b/examples/widgets/widgets/groupbox/CMakeLists.txt index 313d71b6fd..9108a0a868 100644 --- a/examples/widgets/widgets/groupbox/CMakeLists.txt +++ b/examples/widgets/widgets/groupbox/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from groupbox.pro. - cmake_minimum_required(VERSION 3.16) project(groupbox LANGUAGES CXX) diff --git a/examples/widgets/widgets/icons/CMakeLists.txt b/examples/widgets/widgets/icons/CMakeLists.txt index 07ec4174a0..52a59c1d3d 100644 --- a/examples/widgets/widgets/icons/CMakeLists.txt +++ b/examples/widgets/widgets/icons/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from icons.pro. - cmake_minimum_required(VERSION 3.16) project(icons LANGUAGES CXX) @@ -29,7 +27,7 @@ set_target_properties(icons PROPERTIES MACOSX_BUNDLE TRUE ) target_compile_definitions(icons PUBLIC - SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}" # special case + SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}" ) target_link_libraries(icons PUBLIC diff --git a/examples/widgets/widgets/imageviewer/CMakeLists.txt b/examples/widgets/widgets/imageviewer/CMakeLists.txt index 650a467108..96b782b0cd 100644 --- a/examples/widgets/widgets/imageviewer/CMakeLists.txt +++ b/examples/widgets/widgets/imageviewer/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from imageviewer.pro. - cmake_minimum_required(VERSION 3.16) project(imageviewer LANGUAGES CXX) @@ -33,11 +31,10 @@ target_link_libraries(imageviewer PUBLIC Qt::Gui Qt::Widgets ) -# special case begin + if (TARGET Qt::PrintSupport) target_link_libraries(imageviewer PUBLIC Qt::PrintSupport) endif() -# special case end if(TARGET Qt::PrintSupport) target_link_libraries(imageviewer PUBLIC diff --git a/examples/widgets/widgets/lineedits/CMakeLists.txt b/examples/widgets/widgets/lineedits/CMakeLists.txt index f5c127d297..7cc503cdfc 100644 --- a/examples/widgets/widgets/lineedits/CMakeLists.txt +++ b/examples/widgets/widgets/lineedits/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from lineedits.pro. - cmake_minimum_required(VERSION 3.16) project(lineedits LANGUAGES CXX) diff --git a/examples/widgets/widgets/mousebuttons/CMakeLists.txt b/examples/widgets/widgets/mousebuttons/CMakeLists.txt index df186c8d61..8083642320 100644 --- a/examples/widgets/widgets/mousebuttons/CMakeLists.txt +++ b/examples/widgets/widgets/mousebuttons/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from mousebuttons.pro. - cmake_minimum_required(VERSION 3.16) project(mousebuttons LANGUAGES CXX) diff --git a/examples/widgets/widgets/movie/CMakeLists.txt b/examples/widgets/widgets/movie/CMakeLists.txt index f16ac5fbcf..37ff633a6a 100644 --- a/examples/widgets/widgets/movie/CMakeLists.txt +++ b/examples/widgets/widgets/movie/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from movie.pro. - cmake_minimum_required(VERSION 3.16) project(movie LANGUAGES CXX) diff --git a/examples/widgets/widgets/scribble/CMakeLists.txt b/examples/widgets/widgets/scribble/CMakeLists.txt index b0ea465d55..92001b138f 100644 --- a/examples/widgets/widgets/scribble/CMakeLists.txt +++ b/examples/widgets/widgets/scribble/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from scribble.pro. - cmake_minimum_required(VERSION 3.16) project(scribble LANGUAGES CXX) @@ -34,11 +32,10 @@ target_link_libraries(scribble PUBLIC Qt::Gui Qt::Widgets ) -# special case begin + if (TARGET Qt::PrintSupport) target_link_libraries(scribble PUBLIC Qt::PrintSupport) endif() -# special case end if(TARGET Qt::PrintSupport) target_link_libraries(scribble PUBLIC diff --git a/examples/widgets/widgets/shapedclock/CMakeLists.txt b/examples/widgets/widgets/shapedclock/CMakeLists.txt index dc6b3f4105..5271bcf096 100644 --- a/examples/widgets/widgets/shapedclock/CMakeLists.txt +++ b/examples/widgets/widgets/shapedclock/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from shapedclock.pro. - cmake_minimum_required(VERSION 3.16) project(shapedclock LANGUAGES CXX) diff --git a/examples/widgets/widgets/sliders/CMakeLists.txt b/examples/widgets/widgets/sliders/CMakeLists.txt index 8598087289..8354eef6af 100644 --- a/examples/widgets/widgets/sliders/CMakeLists.txt +++ b/examples/widgets/widgets/sliders/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from sliders.pro. - cmake_minimum_required(VERSION 3.16) project(sliders LANGUAGES CXX) diff --git a/examples/widgets/widgets/spinboxes/CMakeLists.txt b/examples/widgets/widgets/spinboxes/CMakeLists.txt index 481530f910..bc38a8f360 100644 --- a/examples/widgets/widgets/spinboxes/CMakeLists.txt +++ b/examples/widgets/widgets/spinboxes/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from spinboxes.pro. - cmake_minimum_required(VERSION 3.16) project(spinboxes LANGUAGES CXX) diff --git a/examples/widgets/widgets/styles/CMakeLists.txt b/examples/widgets/widgets/styles/CMakeLists.txt index ac33b59b72..ca478eccaa 100644 --- a/examples/widgets/widgets/styles/CMakeLists.txt +++ b/examples/widgets/widgets/styles/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from styles.pro. - cmake_minimum_required(VERSION 3.16) project(styles LANGUAGES CXX) diff --git a/examples/widgets/widgets/stylesheet/CMakeLists.txt b/examples/widgets/widgets/stylesheet/CMakeLists.txt index 63286c3e95..743859d5cb 100644 --- a/examples/widgets/widgets/stylesheet/CMakeLists.txt +++ b/examples/widgets/widgets/stylesheet/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from stylesheet.pro. - cmake_minimum_required(VERSION 3.16) project(stylesheet LANGUAGES CXX) diff --git a/examples/widgets/widgets/tablet/CMakeLists.txt b/examples/widgets/widgets/tablet/CMakeLists.txt index 233c5cb03c..f2faeef3f9 100644 --- a/examples/widgets/widgets/tablet/CMakeLists.txt +++ b/examples/widgets/widgets/tablet/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from tablet.pro. - cmake_minimum_required(VERSION 3.16) project(qttablet LANGUAGES CXX) diff --git a/examples/widgets/widgets/tetrix/CMakeLists.txt b/examples/widgets/widgets/tetrix/CMakeLists.txt index 04a48b337b..6e76e5c9f0 100644 --- a/examples/widgets/widgets/tetrix/CMakeLists.txt +++ b/examples/widgets/widgets/tetrix/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from tetrix.pro. - cmake_minimum_required(VERSION 3.16) project(tetrix LANGUAGES CXX) diff --git a/examples/widgets/widgets/tooltips/CMakeLists.txt b/examples/widgets/widgets/tooltips/CMakeLists.txt index 49291c48f7..8126e7eb06 100644 --- a/examples/widgets/widgets/tooltips/CMakeLists.txt +++ b/examples/widgets/widgets/tooltips/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from tooltips.pro. - cmake_minimum_required(VERSION 3.16) project(tooltips LANGUAGES CXX) diff --git a/examples/widgets/widgets/validators/CMakeLists.txt b/examples/widgets/widgets/validators/CMakeLists.txt index a14f210711..c6e9ea905f 100644 --- a/examples/widgets/widgets/validators/CMakeLists.txt +++ b/examples/widgets/widgets/validators/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from validators.pro. - cmake_minimum_required(VERSION 3.16) project(validators LANGUAGES CXX) diff --git a/examples/widgets/widgets/wiggly/CMakeLists.txt b/examples/widgets/widgets/wiggly/CMakeLists.txt index 41f29a804d..26bd8d14e8 100644 --- a/examples/widgets/widgets/wiggly/CMakeLists.txt +++ b/examples/widgets/widgets/wiggly/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from wiggly.pro. - cmake_minimum_required(VERSION 3.16) project(wiggly LANGUAGES CXX) diff --git a/examples/widgets/widgets/windowflags/CMakeLists.txt b/examples/widgets/widgets/windowflags/CMakeLists.txt index 513f1c7522..914bfd60eb 100644 --- a/examples/widgets/widgets/windowflags/CMakeLists.txt +++ b/examples/widgets/widgets/windowflags/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from windowflags.pro. - cmake_minimum_required(VERSION 3.16) project(windowflags LANGUAGES CXX) diff --git a/examples/widgets/windowcontainer/CMakeLists.txt b/examples/widgets/windowcontainer/CMakeLists.txt index 9d344fb60e..b4f948311f 100644 --- a/examples/widgets/windowcontainer/CMakeLists.txt +++ b/examples/widgets/windowcontainer/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from windowcontainer.pro. - cmake_minimum_required(VERSION 3.16) project(windowcontainer LANGUAGES CXX) |