diff --git a/examples/vulkan/CMakeLists.txt b/examples/vulkan/CMakeLists.txt index e4a1af8e267..b6f1dfc9138 100644 --- a/examples/vulkan/CMakeLists.txt +++ b/examples/vulkan/CMakeLists.txt @@ -3,7 +3,6 @@ qt_internal_add_example(hellovulkanwindow) qt_internal_add_example(hellovulkantriangle) -qt_internal_add_example(hellovulkantexture) if(TARGET Qt6::Widgets) qt_internal_add_example(hellovulkanwidget) endif() diff --git a/examples/vulkan/doc/images/hellovulkantexture.png b/examples/vulkan/doc/images/hellovulkantexture.png deleted file mode 100644 index 0cb47a70be3..00000000000 Binary files a/examples/vulkan/doc/images/hellovulkantexture.png and /dev/null differ diff --git a/examples/vulkan/doc/src/hellovulkantexture.qdoc b/examples/vulkan/doc/src/hellovulkantexture.qdoc deleted file mode 100644 index 4945000f88c..00000000000 --- a/examples/vulkan/doc/src/hellovulkantexture.qdoc +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only - -/*! - \example hellovulkantexture - \meta installpath vulkan - \ingroup examples-vulkan - \title Hello Vulkan Texture Vulkan Example - \brief Shows the basics of rendering with textures in a QVulkanWindow. - - The \e{Hello Vulkan Texture Example} builds on \l hellovulkantriangle. Here - instead of drawing a single triangle, a triangle strip is drawn in order to - get a quad on the screen. This is then textured using a QImage loaded from - a .png image file. - - \image hellovulkantexture.png - \include examples-run.qdocinc -*/ diff --git a/examples/vulkan/vulkan.pro b/examples/vulkan/vulkan.pro index 920762cb9e1..b810cb96fca 100644 --- a/examples/vulkan/vulkan.pro +++ b/examples/vulkan/vulkan.pro @@ -1,8 +1,7 @@ TEMPLATE = subdirs SUBDIRS = hellovulkanwindow \ - hellovulkantriangle \ - hellovulkantexture + hellovulkantriangle qtHaveModule(widgets) { SUBDIRS += hellovulkanwidget diff --git a/examples/vulkan/hellovulkantexture/CMakeLists.txt b/tests/manual/examples/vulkan/hellovulkantexture/CMakeLists.txt similarity index 100% rename from examples/vulkan/hellovulkantexture/CMakeLists.txt rename to tests/manual/examples/vulkan/hellovulkantexture/CMakeLists.txt diff --git a/examples/vulkan/hellovulkantexture/hellovulkantexture.cpp b/tests/manual/examples/vulkan/hellovulkantexture/hellovulkantexture.cpp similarity index 100% rename from examples/vulkan/hellovulkantexture/hellovulkantexture.cpp rename to tests/manual/examples/vulkan/hellovulkantexture/hellovulkantexture.cpp diff --git a/examples/vulkan/hellovulkantexture/hellovulkantexture.h b/tests/manual/examples/vulkan/hellovulkantexture/hellovulkantexture.h similarity index 100% rename from examples/vulkan/hellovulkantexture/hellovulkantexture.h rename to tests/manual/examples/vulkan/hellovulkantexture/hellovulkantexture.h diff --git a/examples/vulkan/hellovulkantexture/hellovulkantexture.pro b/tests/manual/examples/vulkan/hellovulkantexture/hellovulkantexture.pro similarity index 100% rename from examples/vulkan/hellovulkantexture/hellovulkantexture.pro rename to tests/manual/examples/vulkan/hellovulkantexture/hellovulkantexture.pro diff --git a/examples/vulkan/hellovulkantexture/hellovulkantexture.qrc b/tests/manual/examples/vulkan/hellovulkantexture/hellovulkantexture.qrc similarity index 100% rename from examples/vulkan/hellovulkantexture/hellovulkantexture.qrc rename to tests/manual/examples/vulkan/hellovulkantexture/hellovulkantexture.qrc diff --git a/examples/vulkan/hellovulkantexture/main.cpp b/tests/manual/examples/vulkan/hellovulkantexture/main.cpp similarity index 100% rename from examples/vulkan/hellovulkantexture/main.cpp rename to tests/manual/examples/vulkan/hellovulkantexture/main.cpp diff --git a/examples/vulkan/hellovulkantexture/qt256.png b/tests/manual/examples/vulkan/hellovulkantexture/qt256.png similarity index 100% rename from examples/vulkan/hellovulkantexture/qt256.png rename to tests/manual/examples/vulkan/hellovulkantexture/qt256.png diff --git a/examples/vulkan/hellovulkantexture/texture.frag b/tests/manual/examples/vulkan/hellovulkantexture/texture.frag similarity index 100% rename from examples/vulkan/hellovulkantexture/texture.frag rename to tests/manual/examples/vulkan/hellovulkantexture/texture.frag diff --git a/examples/vulkan/hellovulkantexture/texture.vert b/tests/manual/examples/vulkan/hellovulkantexture/texture.vert similarity index 100% rename from examples/vulkan/hellovulkantexture/texture.vert rename to tests/manual/examples/vulkan/hellovulkantexture/texture.vert diff --git a/examples/vulkan/hellovulkantexture/texture_frag.spv b/tests/manual/examples/vulkan/hellovulkantexture/texture_frag.spv similarity index 100% rename from examples/vulkan/hellovulkantexture/texture_frag.spv rename to tests/manual/examples/vulkan/hellovulkantexture/texture_frag.spv diff --git a/examples/vulkan/hellovulkantexture/texture_vert.spv b/tests/manual/examples/vulkan/hellovulkantexture/texture_vert.spv similarity index 100% rename from examples/vulkan/hellovulkantexture/texture_vert.spv rename to tests/manual/examples/vulkan/hellovulkantexture/texture_vert.spv