From ec0ec52cb87a159c3ed64795aeef73adb647f423 Mon Sep 17 00:00:00 2001 From: Oliver Eftevaag Date: Mon, 8 Nov 2021 14:31:16 +0100 Subject: Embeddedinwidgets example: use qt_add_qml_module() We want to use the new cmake api, rather than qt6_add_resources() Task-number: QTBUG-98130 Change-Id: I567aec77b963adce03fb683c244d758880891ce5 Reviewed-by: Ulf Hermann (cherry picked from commit fb264129529dc39cf94bc3e69ef14cc08d26df78) Reviewed-by: Qt Cherry-pick Bot --- examples/quick/embeddedinwidgets/CMakeLists.txt | 44 +++++++------------------ 1 file changed, 11 insertions(+), 33 deletions(-) diff --git a/examples/quick/embeddedinwidgets/CMakeLists.txt b/examples/quick/embeddedinwidgets/CMakeLists.txt index c1cb79e027..9f90d696b7 100644 --- a/examples/quick/embeddedinwidgets/CMakeLists.txt +++ b/examples/quick/embeddedinwidgets/CMakeLists.txt @@ -1,5 +1,3 @@ -# Generated from embeddedinwidgets.pro. - cmake_minimum_required(VERSION 3.16) project(embeddedinwidgets LANGUAGES CXX) @@ -7,7 +5,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") @@ -15,20 +12,12 @@ endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/embeddedinwidgets") -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Widgets) -find_package(Qt6 COMPONENTS Quick) -find_package(Qt6 COMPONENTS ShaderTools) +find_package(Qt6 COMPONENTS Core Gui Widgets Quick) -qt_add_executable(embeddedinwidgets +qt_add_executable(embeddedinwidgetsexample WIN32 MACOSX_BUNDLE main.cpp ) -set_target_properties(embeddedinwidgets PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) -target_link_libraries(embeddedinwidgets PUBLIC +target_link_libraries(embeddedinwidgetsexample PRIVATE Qt::Core Qt::Gui Qt::Quick @@ -37,27 +26,16 @@ target_link_libraries(embeddedinwidgets PUBLIC # Resources: -set(embeddedinwidgets_resource_files - "main.qml" -) - -qt6_add_resources(embeddedinwidgets "embeddedinwidgets" - PREFIX - "/embeddedinwidgets" - FILES - ${embeddedinwidgets_resource_files} -) - -qt6_add_shaders(embeddedinwidgets "shaders" - PRECOMPILE - OPTIMIZED - PREFIX - "/embeddedinwidgets" - FILES - "reflect.frag" +qt_add_qml_module(embeddedinwidgetsexample + URI embeddedinwidgets + VERSION 1.0 + QML_FILES + "main.qml" + RESOURCES + "reflect.frag.qsb" ) -install(TARGETS embeddedinwidgets +install(TARGETS embeddedinwidgetsexample RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -- cgit v1.2.3