diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 13:55:03 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 08:49:58 +0000 |
| commit | 31df3b6ced92197636e0b1f450631971bbf17cd2 (patch) | |
| tree | a7c5bb05b40b363af4a52058ef580fcab62b44bf /examples | |
| parent | 6a0bb9a7d6a6473920da74bb48c52a4eaed990b0 (diff) | |
Regenerate the necessary bits of qtdeclarative after wip/qt6 merge
Change-Id: If58c29baf7fa3c3591968fca6d11f7649308dbf9
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/quick/imageelements/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | examples/quick/scenegraph/rendernode/CMakeLists.txt | 27 |
2 files changed, 30 insertions, 2 deletions
diff --git a/examples/quick/imageelements/CMakeLists.txt b/examples/quick/imageelements/CMakeLists.txt index 5e233983aa..2f4f5ad00d 100644 --- a/examples/quick/imageelements/CMakeLists.txt +++ b/examples/quick/imageelements/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/imageelements") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -42,11 +42,14 @@ set(imageelements_resource_files "content/colors-round.sci" "content/colors-stretch.sci" "content/colors.png" + "content/multi.ico" "content/qt-logo.png" "content/shadow.png" "content/speaker.png" + "framestepping.qml" "image.qml" "imageelements.qml" + "multiframeborderimage.qml" "shadows.qml" "spritesequence.qml" ) diff --git a/examples/quick/scenegraph/rendernode/CMakeLists.txt b/examples/quick/scenegraph/rendernode/CMakeLists.txt index 40d2c20849..9f0ad7da52 100644 --- a/examples/quick/scenegraph/rendernode/CMakeLists.txt +++ b/examples/quick/scenegraph/rendernode/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/quick/scenegraph/rendernode") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) @@ -32,6 +32,8 @@ target_link_libraries(rendernode PUBLIC # Resources: set(rendernode_resource_files "main.qml" + "metalshader.frag" + "metalshader.vert" "shader_frag.cso" "shader_vert.cso" ) @@ -44,6 +46,29 @@ qt6_add_resources(rendernode "rendernode" ) +if(QT_FEATURE_d3d12) + target_sources(rendernode PUBLIC + d3d12renderer.cpp d3d12renderer.h + ) + + target_link_libraries(rendernode PUBLIC + d3d12 + ) + +endif() + +if(APPLE_OSX) + target_sources(rendernode PUBLIC + metalrenderer.h metalrenderer.mm + ) + + target_link_libraries(rendernode PUBLIC + "-framework AppKit" + "-framework Metal" + ) + +endif() + install(TARGETS rendernode RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" |