diff options
Diffstat (limited to 'examples/widgets/desktop/screenshot')
-rw-r--r-- | examples/widgets/desktop/screenshot/CMakeLists.txt | 31 | ||||
-rw-r--r-- | examples/widgets/desktop/screenshot/screenshot.cpp | 2 |
2 files changed, 17 insertions, 16 deletions
diff --git a/examples/widgets/desktop/screenshot/CMakeLists.txt b/examples/widgets/desktop/screenshot/CMakeLists.txt index 9fe63429ea..4d9b97d114 100644 --- a/examples/widgets/desktop/screenshot/CMakeLists.txt +++ b/examples/widgets/desktop/screenshot/CMakeLists.txt @@ -4,16 +4,10 @@ cmake_minimum_required(VERSION 3.16) project(screenshot LANGUAGES CXX) -set(CMAKE_AUTOMOC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/desktop/screenshot") - find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) +qt_standard_project_setup() + qt_add_executable(screenshot main.cpp screenshot.cpp screenshot.h @@ -24,14 +18,21 @@ set_target_properties(screenshot PROPERTIES MACOSX_BUNDLE TRUE ) -target_link_libraries(screenshot PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets +target_link_libraries(screenshot PRIVATE + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS screenshot - 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 screenshot + OUTPUT_SCRIPT deploy_script + NO_UNSUPPORTED_PLATFORM_ERROR ) +install(SCRIPT ${deploy_script}) diff --git a/examples/widgets/desktop/screenshot/screenshot.cpp b/examples/widgets/desktop/screenshot/screenshot.cpp index 271ef8c776..5a4ba901b7 100644 --- a/examples/widgets/desktop/screenshot/screenshot.cpp +++ b/examples/widgets/desktop/screenshot/screenshot.cpp @@ -62,7 +62,7 @@ void Screenshot::resizeEvent(QResizeEvent * /* event */) { QSize scaledSize = originalPixmap.size(); scaledSize.scale(screenshotLabel->size(), Qt::KeepAspectRatio); - if (scaledSize != screenshotLabel->pixmap(Qt::ReturnByValue).size()) + if (scaledSize != screenshotLabel->pixmap().size()) updateScreenshotLabel(); } //! [1] |