aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quick/scenegraph
diff options
context:
space:
mode:
authorLeander Beernaert <leander.beernaert@qt.io>2019-10-11 15:47:00 +0200
committerLeander Beernaert <leander.beernaert@qt.io>2019-10-14 09:09:55 +0000
commit9e633bbda7608ac0231809e2a6a97ae8f2d849d6 (patch)
tree1139c346c7ee144a74443734a78d7662935b5355 /examples/quick/scenegraph
parent31df3b6ced92197636e0b1f450631971bbf17cd2 (diff)
Regenerate Examples
Change-Id: I2fbfb44bbb6d667e022bffb480feaf74ff0d0a5e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'examples/quick/scenegraph')
-rw-r--r--examples/quick/scenegraph/customgeometry/CMakeLists.txt4
-rw-r--r--examples/quick/scenegraph/d3d11underqml/CMakeLists.txt4
-rw-r--r--examples/quick/scenegraph/graph/CMakeLists.txt4
-rw-r--r--examples/quick/scenegraph/metalunderqml/CMakeLists.txt8
-rw-r--r--examples/quick/scenegraph/openglunderqml/CMakeLists.txt4
-rw-r--r--examples/quick/scenegraph/rendernode/CMakeLists.txt10
-rw-r--r--examples/quick/scenegraph/sgengine/CMakeLists.txt4
-rw-r--r--examples/quick/scenegraph/simplematerial/CMakeLists.txt4
-rw-r--r--examples/quick/scenegraph/textureinsgnode/CMakeLists.txt5
-rw-r--r--examples/quick/scenegraph/textureinthread/CMakeLists.txt6
-rw-r--r--examples/quick/scenegraph/threadedanimation/CMakeLists.txt4
-rw-r--r--examples/quick/scenegraph/twotextureproviders/CMakeLists.txt4
12 files changed, 37 insertions, 24 deletions
diff --git a/examples/quick/scenegraph/customgeometry/CMakeLists.txt b/examples/quick/scenegraph/customgeometry/CMakeLists.txt
index 079476a205..a206d75bd4 100644
--- a/examples/quick/scenegraph/customgeometry/CMakeLists.txt
+++ b/examples/quick/scenegraph/customgeometry/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/customgeometry")
find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
@@ -25,6 +25,7 @@ target_link_libraries(customgeometry PUBLIC
Qt::Quick
)
+
# Resources:
set(customgeometry_resource_files
"main.qml"
@@ -37,7 +38,6 @@ qt6_add_resources(customgeometry "customgeometry"
${customgeometry_resource_files}
)
-
install(TARGETS customgeometry
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/quick/scenegraph/d3d11underqml/CMakeLists.txt b/examples/quick/scenegraph/d3d11underqml/CMakeLists.txt
index 098b5e70da..b34d8026b6 100644
--- a/examples/quick/scenegraph/d3d11underqml/CMakeLists.txt
+++ b/examples/quick/scenegraph/d3d11underqml/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/d3d11underqml")
find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
@@ -29,6 +29,7 @@ target_link_libraries(d3d11underqml PUBLIC
d3dcompiler
)
+
# Resources:
set(d3d11underqml_resource_files
"main.qml"
@@ -43,7 +44,6 @@ qt6_add_resources(d3d11underqml "d3d11underqml"
${d3d11underqml_resource_files}
)
-
install(TARGETS d3d11underqml
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/quick/scenegraph/graph/CMakeLists.txt b/examples/quick/scenegraph/graph/CMakeLists.txt
index 7ac1d3ad42..da9078df03 100644
--- a/examples/quick/scenegraph/graph/CMakeLists.txt
+++ b/examples/quick/scenegraph/graph/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/graph")
find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
@@ -28,6 +28,7 @@ target_link_libraries(graph PUBLIC
Qt::Quick
)
+
# Resources:
set(graph_resource_files
"main.qml"
@@ -44,7 +45,6 @@ qt6_add_resources(graph "graph"
${graph_resource_files}
)
-
install(TARGETS graph
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/quick/scenegraph/metalunderqml/CMakeLists.txt b/examples/quick/scenegraph/metalunderqml/CMakeLists.txt
index 9702987176..6f61cdd727 100644
--- a/examples/quick/scenegraph/metalunderqml/CMakeLists.txt
+++ b/examples/quick/scenegraph/metalunderqml/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/metalunderqml")
find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
@@ -21,14 +21,15 @@ add_qt_gui_executable(metalunderqml
metalsquircle.h metalsquircle.mm
)
target_link_libraries(metalunderqml PUBLIC
- ${FWAppKit}
- ${FWMetal}
+ "-framework AppKit"
+ "-framework Metal"
Qt::Core
Qt::Gui
Qt::Qml
Qt::Quick
)
+
# Resources:
set(metalunderqml_resource_files
"main.qml"
@@ -43,7 +44,6 @@ qt6_add_resources(metalunderqml "metalunderqml"
${metalunderqml_resource_files}
)
-
install(TARGETS metalunderqml
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/quick/scenegraph/openglunderqml/CMakeLists.txt b/examples/quick/scenegraph/openglunderqml/CMakeLists.txt
index 238c8c707f..1b83e8c32a 100644
--- a/examples/quick/scenegraph/openglunderqml/CMakeLists.txt
+++ b/examples/quick/scenegraph/openglunderqml/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/openglunderqml")
find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
@@ -27,6 +27,7 @@ target_link_libraries(openglunderqml PUBLIC
Qt::Quick
)
+
# Resources:
set(openglunderqml_resource_files
"main.qml"
@@ -39,7 +40,6 @@ qt6_add_resources(openglunderqml "openglunderqml"
${openglunderqml_resource_files}
)
-
install(TARGETS openglunderqml
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/quick/scenegraph/rendernode/CMakeLists.txt b/examples/quick/scenegraph/rendernode/CMakeLists.txt
index 9f0ad7da52..05ed4dab42 100644
--- a/examples/quick/scenegraph/rendernode/CMakeLists.txt
+++ b/examples/quick/scenegraph/rendernode/CMakeLists.txt
@@ -29,6 +29,7 @@ target_link_libraries(rendernode PUBLIC
Qt::Quick
)
+
# Resources:
set(rendernode_resource_files
"main.qml"
@@ -45,6 +46,15 @@ qt6_add_resources(rendernode "rendernode"
${rendernode_resource_files}
)
+if(QT_FEATURE_d3d12)
+ target_sources(rendernode PUBLIC
+ d3d12renderer.cpp d3d12renderer.h
+ )
+
+ target_link_libraries(rendernode PUBLIC
+ d3d12
+ )
+endif()
if(QT_FEATURE_d3d12)
target_sources(rendernode PUBLIC
diff --git a/examples/quick/scenegraph/sgengine/CMakeLists.txt b/examples/quick/scenegraph/sgengine/CMakeLists.txt
index 42f342dc20..7580796800 100644
--- a/examples/quick/scenegraph/sgengine/CMakeLists.txt
+++ b/examples/quick/scenegraph/sgengine/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/sgengine")
find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
@@ -25,6 +25,7 @@ target_link_libraries(sgengine PUBLIC
Qt::Quick
)
+
# Resources:
set(sgengine_resource_files
"face-smile.png"
@@ -108,7 +109,6 @@ qt6_add_resources(sgengine "shared"
${shared_resource_files}
)
-
install(TARGETS sgengine
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/quick/scenegraph/simplematerial/CMakeLists.txt b/examples/quick/scenegraph/simplematerial/CMakeLists.txt
index 21c2609cfe..9fb02cb53b 100644
--- a/examples/quick/scenegraph/simplematerial/CMakeLists.txt
+++ b/examples/quick/scenegraph/simplematerial/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/simplematerial")
find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
@@ -24,6 +24,7 @@ target_link_libraries(simplematerial PUBLIC
Qt::Quick
)
+
# Resources:
set(simplematerial_resource_files
"main.qml"
@@ -36,7 +37,6 @@ qt6_add_resources(simplematerial "simplematerial"
${simplematerial_resource_files}
)
-
install(TARGETS simplematerial
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/quick/scenegraph/textureinsgnode/CMakeLists.txt b/examples/quick/scenegraph/textureinsgnode/CMakeLists.txt
index c92ea4b8b7..1117ef22a9 100644
--- a/examples/quick/scenegraph/textureinsgnode/CMakeLists.txt
+++ b/examples/quick/scenegraph/textureinsgnode/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/textureinsgnode")
find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
@@ -24,6 +24,7 @@ add_qt_gui_executable(textureinsgnode
target_include_directories(textureinsgnode PUBLIC
../shared
)
+
target_link_libraries(textureinsgnode PUBLIC
Qt::Core
Qt::Gui
@@ -31,6 +32,7 @@ target_link_libraries(textureinsgnode PUBLIC
Qt::Quick
)
+
# Resources:
set(textureinsgnode_resource_files
"main.qml"
@@ -43,7 +45,6 @@ qt6_add_resources(textureinsgnode "textureinsgnode"
${textureinsgnode_resource_files}
)
-
install(TARGETS textureinsgnode
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/quick/scenegraph/textureinthread/CMakeLists.txt b/examples/quick/scenegraph/textureinthread/CMakeLists.txt
index 12579b3456..b409f230af 100644
--- a/examples/quick/scenegraph/textureinthread/CMakeLists.txt
+++ b/examples/quick/scenegraph/textureinthread/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/textureinthread")
find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
@@ -23,16 +23,19 @@ add_qt_gui_executable(textureinthread
target_include_directories(textureinthread PUBLIC
../shared
)
+
target_link_libraries(textureinthread PRIVATE
Qt::CorePrivate
Qt::GuiPrivate
)
+
target_link_libraries(textureinthread PUBLIC
Qt::Core
Qt::Gui
Qt::Quick
)
+
# Resources:
set(textureinthread_resource_files
"error.qml"
@@ -46,7 +49,6 @@ qt6_add_resources(textureinthread "textureinthread"
${textureinthread_resource_files}
)
-
install(TARGETS textureinthread
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/quick/scenegraph/threadedanimation/CMakeLists.txt b/examples/quick/scenegraph/threadedanimation/CMakeLists.txt
index eae7e6a1b3..be45e855da 100644
--- a/examples/quick/scenegraph/threadedanimation/CMakeLists.txt
+++ b/examples/quick/scenegraph/threadedanimation/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/threadedanimation")
find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
@@ -27,6 +27,7 @@ target_link_libraries(threadedanimation PUBLIC
Qt::Quick
)
+
# Resources:
set(threadedanimation_resource_files
"main.qml"
@@ -40,7 +41,6 @@ qt6_add_resources(threadedanimation "threadedanimation"
${threadedanimation_resource_files}
)
-
install(TARGETS threadedanimation
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/quick/scenegraph/twotextureproviders/CMakeLists.txt b/examples/quick/scenegraph/twotextureproviders/CMakeLists.txt
index 2969997b08..adcc3b8978 100644
--- a/examples/quick/scenegraph/twotextureproviders/CMakeLists.txt
+++ b/examples/quick/scenegraph/twotextureproviders/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/twotextureproviders")
find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
@@ -27,6 +27,7 @@ target_link_libraries(twotextureproviders PUBLIC
Qt::Quick
)
+
# Resources:
set(twotextureproviders_resource_files
"main.qml"
@@ -39,7 +40,6 @@ qt6_add_resources(twotextureproviders "twotextureproviders"
${twotextureproviders_resource_files}
)
-
install(TARGETS twotextureproviders
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"