diff options
Diffstat (limited to 'examples/widgets/graphicsview/chip')
-rw-r--r-- | examples/widgets/graphicsview/chip/CMakeLists.txt | 40 | ||||
-rw-r--r-- | examples/widgets/graphicsview/chip/main.cpp | 2 | ||||
-rw-r--r-- | examples/widgets/graphicsview/chip/mainwindow.cpp | 3 |
3 files changed, 21 insertions, 24 deletions
diff --git a/examples/widgets/graphicsview/chip/CMakeLists.txt b/examples/widgets/graphicsview/chip/CMakeLists.txt index 9d182454e9..81b2e19552 100644 --- a/examples/widgets/graphicsview/chip/CMakeLists.txt +++ b/examples/widgets/graphicsview/chip/CMakeLists.txt @@ -1,19 +1,16 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + cmake_minimum_required(VERSION 3.16) project(chip LANGUAGES CXX) -set(CMAKE_AUTOMOC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/graphicsview/chip") - find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets OPTIONAL_COMPONENTS PrintSupport ) +qt_standard_project_setup() + qt_add_executable(chip chip.cpp chip.h main.cpp @@ -26,10 +23,10 @@ set_target_properties(chip PROPERTIES MACOSX_BUNDLE TRUE ) -target_link_libraries(chip PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets +target_link_libraries(chip PRIVATE + Qt6::Core + Qt6::Gui + Qt6::Widgets ) # Resources: @@ -49,14 +46,19 @@ qt_add_resources(chip "images" ${images_resource_files} ) -if(TARGET Qt::PrintSupport) - target_link_libraries(chip PUBLIC - Qt::PrintSupport - ) +if(TARGET Qt6::PrintSupport) + target_link_libraries(chip PRIVATE Qt6::PrintSupport) endif() install(TARGETS chip - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION . + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +) + +qt_generate_deploy_app_script( + TARGET chip + OUTPUT_SCRIPT deploy_script + NO_UNSUPPORTED_PLATFORM_ERROR ) +install(SCRIPT ${deploy_script}) diff --git a/examples/widgets/graphicsview/chip/main.cpp b/examples/widgets/graphicsview/chip/main.cpp index bf75db6a93..4ccd66bbb9 100644 --- a/examples/widgets/graphicsview/chip/main.cpp +++ b/examples/widgets/graphicsview/chip/main.cpp @@ -7,8 +7,6 @@ int main(int argc, char *argv[]) { - Q_INIT_RESOURCE(images); - QApplication app(argc, argv); app.setAttribute(Qt::AA_DontCreateNativeWidgetSiblings); diff --git a/examples/widgets/graphicsview/chip/mainwindow.cpp b/examples/widgets/graphicsview/chip/mainwindow.cpp index 00de1d852e..8b4f5b27fd 100644 --- a/examples/widgets/graphicsview/chip/mainwindow.cpp +++ b/examples/widgets/graphicsview/chip/mainwindow.cpp @@ -48,7 +48,6 @@ void MainWindow::populateScene() // Populate scene int xx = 0; - int nitems = 0; for (int i = -11000; i < 11000; i += 110) { ++xx; int yy = 0; @@ -61,8 +60,6 @@ void MainWindow::populateScene() QGraphicsItem *item = new Chip(color, xx, yy); item->setPos(QPointF(i, j)); scene->addItem(item); - - ++nitems; } } } |