From 14492ecee2e34843efd3ef070503a43a48552055 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 9 Mar 2020 13:53:53 +0100 Subject: CMake: Regenerate and adapt to merge from dev MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If8daa6152a563d4309d7342414780ef75b9f5589 Reviewed-by: Tor Arne Vestbø Reviewed-by: Leander Beernaert --- examples/quick/CMakeLists.txt | 2 +- examples/quick/scenegraph/CMakeLists.txt | 4 ++-- examples/quick/scenegraph/metaltextureimport/CMakeLists.txt | 8 ++++++++ examples/quick/scenegraph/vulkanunderqml/CMakeLists.txt | 8 ++++++++ 4 files changed, 19 insertions(+), 3 deletions(-) (limited to 'examples') diff --git a/examples/quick/CMakeLists.txt b/examples/quick/CMakeLists.txt index 5299e95ae2..8940ff9c70 100644 --- a/examples/quick/CMakeLists.txt +++ b/examples/quick/CMakeLists.txt @@ -35,6 +35,6 @@ endif() if(TARGET Qt::Widgets) add_subdirectory(embeddedinwidgets) endif() -if(TARGET Qt::Widgets AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3) AND (QT_FEATURE_opengles2 OR QT_FEATURE_opengles3 OR TARGET Qt::QuickWidgets)) +if(TARGET Qt::QuickWidgets AND TARGET Qt::Widgets AND (QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3)) add_subdirectory(quickwidgets) endif() diff --git a/examples/quick/scenegraph/CMakeLists.txt b/examples/quick/scenegraph/CMakeLists.txt index c868b34938..6dbec6c251 100644 --- a/examples/quick/scenegraph/CMakeLists.txt +++ b/examples/quick/scenegraph/CMakeLists.txt @@ -1,7 +1,7 @@ # Generated from scenegraph.pro. add_subdirectory(customgeometry) -add_subdirectory(rendernode) +# add_subdirectory(rendernode) # special case needs fixing add_subdirectory(threadedanimation) if(QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3) add_subdirectory(graph) @@ -13,7 +13,7 @@ if(QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3) add_subdirectory(twotextureproviders) endif() if(APPLE_OSX) - add_subdirectory(metalunderqml) + # add_subdirectory(metalunderqml) # special case needs fixing # add_subdirectory(metaltextureimport) # special case TODO endif() if(WIN32) diff --git a/examples/quick/scenegraph/metaltextureimport/CMakeLists.txt b/examples/quick/scenegraph/metaltextureimport/CMakeLists.txt index 08a527f4b8..d84885f4cf 100644 --- a/examples/quick/scenegraph/metaltextureimport/CMakeLists.txt +++ b/examples/quick/scenegraph/metaltextureimport/CMakeLists.txt @@ -54,3 +54,11 @@ install(TARGETS metaltextureimport BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) + +set_target_properties(metaltextureimport PROPERTIES + QT_QML_MODULE_INSTALL_QMLTYPES TRUE + QT_QML_MODULE_VERSION 1.0 + QT_QML_MODULE_URI MetalTextureImport +) + +qt6_qml_type_registration(metaltextureimport) diff --git a/examples/quick/scenegraph/vulkanunderqml/CMakeLists.txt b/examples/quick/scenegraph/vulkanunderqml/CMakeLists.txt index 65442e3790..450af3d5f3 100644 --- a/examples/quick/scenegraph/vulkanunderqml/CMakeLists.txt +++ b/examples/quick/scenegraph/vulkanunderqml/CMakeLists.txt @@ -47,3 +47,11 @@ install(TARGETS vulkanunderqml BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) + +set_target_properties(vulkanunderqml PROPERTIES + QT_QML_MODULE_INSTALL_QMLTYPES TRUE + QT_QML_MODULE_VERSION 1.0 + QT_QML_MODULE_URI VulkanUnderQML +) + +qt6_qml_type_registration(vulkanunderqml) -- cgit v1.2.3