Post merge fixes

Change-Id: Ie8aca222809f35174fb6c6488832ec3ff5432272
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

7 files changed, 23 insertions, 15 deletions

diff --git a/examples/quick/scenegraph/.prev_CMakeLists.txt b/examples/quick/scenegraph/.prev_CMakeLists.txt
index f4e416390a..040945b9e8 100644
--- a/examples/quick/scenegraph/.prev_CMakeLists.txt
+++ b/examples/quick/scenegraph/.prev_CMakeLists.txt
@@ -12,7 +12,7 @@ if(QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3)
     add_subdirectory(textureinthread)
     add_subdirectory(twotextureproviders)
 endif()
-if(APPLE_OSX)
+if(APPLE_IOS OR APPLE_OSX)
     add_subdirectory(metalunderqml)
     add_subdirectory(metaltextureimport)
 endif()
@@ -21,4 +21,5 @@ if(WIN32)
 endif()
 if(QT_FEATURE_vulkan)
     add_subdirectory(vulkanunderqml)
+    add_subdirectory(vulkantextureimport)
 endif()
diff --git a/examples/quick/scenegraph/fboitem/CMakeLists.txt b/examples/quick/scenegraph/fboitem/CMakeLists.txt
index e788fe5468..3f49453d0d 100644
--- a/examples/quick/scenegraph/fboitem/CMakeLists.txt
+++ b/examples/quick/scenegraph/fboitem/CMakeLists.txt
@@ -36,6 +36,8 @@ target_link_libraries(fboitem PUBLIC
 # Resources:
 set(fboitem_resource_files
     "main.qml"
+    "shaders/+qsb/checker.frag"
+    "shaders/checker.frag"
 )
 
 qt6_add_resources(fboitem "fboitem"
diff --git a/examples/quick/scenegraph/metaltextureimport/CMakeLists.txt b/examples/quick/scenegraph/metaltextureimport/CMakeLists.txt
index 82e5fc71c1..08a527f4b8 100644
--- a/examples/quick/scenegraph/metaltextureimport/CMakeLists.txt
+++ b/examples/quick/scenegraph/metaltextureimport/CMakeLists.txt
@@ -21,7 +21,6 @@ add_qt_gui_executable(metaltextureimport
     metaltextureimport.h metaltextureimport.mm
 )
 target_link_libraries(metaltextureimport PUBLIC
-    "-framework AppKit"
     "-framework Metal"
     Qt::Core
     Qt::Gui
@@ -44,6 +43,12 @@ qt6_add_resources(metaltextureimport "metaltextureimport"
         ${metaltextureimport_resource_files}
 )
 
+if(APPLE_OSX)
+    target_link_libraries(metaltextureimport PUBLIC
+        "-framework AppKit"
+    )
+endif()
+
 install(TARGETS metaltextureimport
     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 6f61cdd727..60bb00aa37 100644
--- a/examples/quick/scenegraph/metalunderqml/CMakeLists.txt
+++ b/examples/quick/scenegraph/metalunderqml/CMakeLists.txt
@@ -21,7 +21,6 @@ add_qt_gui_executable(metalunderqml
     metalsquircle.h metalsquircle.mm
 )
 target_link_libraries(metalunderqml PUBLIC
-    "-framework AppKit"
     "-framework Metal"
     Qt::Core
     Qt::Gui
@@ -44,6 +43,12 @@ qt6_add_resources(metalunderqml "metalunderqml"
         ${metalunderqml_resource_files}
 )
 
+if(APPLE_OSX)
+    target_link_libraries(metalunderqml PUBLIC
+        "-framework AppKit"
+    )
+endif()
+
 install(TARGETS metalunderqml
     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 51de91a37e..458dc251e8 100644
--- a/examples/quick/scenegraph/rendernode/CMakeLists.txt
+++ b/examples/quick/scenegraph/rendernode/CMakeLists.txt
@@ -35,8 +35,6 @@ set(rendernode_resource_files
     "main.qml"
     "metalshader.frag"
     "metalshader.vert"
-    "shader_frag.cso"
-    "shader_vert.cso"
 )
 
 qt6_add_resources(rendernode "rendernode"
@@ -46,16 +44,6 @@ 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(APPLE_OSX)
     target_sources(rendernode PUBLIC
         metalrenderer.h metalrenderer.mm
diff --git a/examples/quick/scenegraph/simplematerial/CMakeLists.txt b/examples/quick/scenegraph/simplematerial/CMakeLists.txt
index 9fb02cb53b..6c385f4983 100644
--- a/examples/quick/scenegraph/simplematerial/CMakeLists.txt
+++ b/examples/quick/scenegraph/simplematerial/CMakeLists.txt
@@ -17,6 +17,7 @@ find_package(Qt6 COMPONENTS Quick)
 
 add_qt_gui_executable(simplematerial
     simplematerial.cpp
+    simplematerialitem.cpp simplematerialitem.h
 )
 target_link_libraries(simplematerial PUBLIC
     Qt::Core
diff --git a/examples/quick/scenegraph/twotextureproviders/CMakeLists.txt b/examples/quick/scenegraph/twotextureproviders/CMakeLists.txt
index adcc3b8978..f9f9ec6bab 100644
--- a/examples/quick/scenegraph/twotextureproviders/CMakeLists.txt
+++ b/examples/quick/scenegraph/twotextureproviders/CMakeLists.txt
@@ -31,6 +31,12 @@ target_link_libraries(twotextureproviders PUBLIC
 # Resources:
 set(twotextureproviders_resource_files
     "main.qml"
+    "shaders/+qsb/checker.frag"
+    "shaders/+qsb/xorblender.frag"
+    "shaders/+qsb/xorblender.vert"
+    "shaders/checker.frag"
+    "shaders/xorblender.frag"
+    "shaders/xorblender.vert"
 )
 
 qt6_add_resources(twotextureproviders "twotextureproviders"