diff options
author | Oliver Eftevaag <oliver.eftevaag@qt.io> | 2023-02-16 16:50:51 +0100 |
---|---|---|
committer | Oliver Eftevaag <oliver.eftevaag@qt.io> | 2023-02-21 19:45:44 +0100 |
commit | dc58fc1f100301155270a8b740086520eda138be (patch) | |
tree | fb0c776cec1c7727f6244422eaf08e6465d89cd8 /examples/quick | |
parent | 8f7080fd0957fea3a67a255e5344ab125fa3c33f (diff) | |
download | qtdeclarative-dc58fc1f100301155270a8b740086520eda138be.tar.gz |
quickwidget and tableview: Make example cmake files adhere to guidelines
- Add qt_standard_project_setup(REQUIRES 6.5)
- Use PRIVATE linkage
- Set WIN32 and MACOSX_BUNDLE properties directly in qt_add_executable()
amends 94e3cf3d95eda294cd578bea01c04e9527a9fd68
Pick-to: 6.5
Change-Id: Ic02b7b15a8aea9387d93ab024f05feeab8a84016
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'examples/quick')
4 files changed, 12 insertions, 14 deletions
diff --git a/examples/quick/quickwidgets/qquickwidgetversuswindow_opengl/CMakeLists.txt b/examples/quick/quickwidgets/qquickwidgetversuswindow_opengl/CMakeLists.txt index 14813bc9ec..7fdbcd4838 100644 --- a/examples/quick/quickwidgets/qquickwidgetversuswindow_opengl/CMakeLists.txt +++ b/examples/quick/quickwidgets/qquickwidgetversuswindow_opengl/CMakeLists.txt @@ -12,7 +12,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/quickwidgets/qquickwidgetve find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick QuickWidgets ShaderTools Widgets) -qt_standard_project_setup() +qt_standard_project_setup(REQUIRES 6.5) qt_add_executable(qquickwidgetversuswindow_opengl WIN32 diff --git a/examples/quick/quickwidgets/quickwidget/CMakeLists.txt b/examples/quick/quickwidgets/quickwidget/CMakeLists.txt index ceb8b39da1..35b29629fd 100644 --- a/examples/quick/quickwidgets/quickwidget/CMakeLists.txt +++ b/examples/quick/quickwidgets/quickwidget/CMakeLists.txt @@ -12,7 +12,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/quickwidgets/quickwidget") find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick QuickWidgets Widgets) -qt_standard_project_setup() +qt_standard_project_setup(REQUIRES 6.5) qt_add_executable(quickwidget WIN32 diff --git a/examples/quick/tableview/gameoflife/CMakeLists.txt b/examples/quick/tableview/gameoflife/CMakeLists.txt index 8195fba9f6..7b17a666dd 100644 --- a/examples/quick/tableview/gameoflife/CMakeLists.txt +++ b/examples/quick/tableview/gameoflife/CMakeLists.txt @@ -14,17 +14,16 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/tableview/gameoflife") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) +qt_standard_project_setup(REQUIRES 6.5) + qt_add_executable(gameoflife + WIN32 + MACOSX_BUNDLE gameoflifemodel.cpp gameoflifemodel.h main.cpp ) -set_target_properties(gameoflife PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) - -target_link_libraries(gameoflife PUBLIC +target_link_libraries(gameoflife PRIVATE Qt::Core Qt::Gui Qt::Qml diff --git a/examples/quick/tableview/pixelator/CMakeLists.txt b/examples/quick/tableview/pixelator/CMakeLists.txt index 6de15b8615..21264df356 100644 --- a/examples/quick/tableview/pixelator/CMakeLists.txt +++ b/examples/quick/tableview/pixelator/CMakeLists.txt @@ -14,17 +14,16 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/tableview/pixelator") find_package(Qt6 REQUIRED COMPONENTS Core Gui Qml Quick) +qt_standard_project_setup(REQUIRES 6.5) + qt_add_executable(qml_pixelator + WIN32 + MACOSX_BUNDLE imagemodel.cpp imagemodel.h main.cpp ) -set_target_properties(qml_pixelator PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) - -target_link_libraries(qml_pixelator PUBLIC +target_link_libraries(qml_pixelator PRIVATE Qt::Core Qt::Gui Qt::Qml |