From 3b015718b0d156bbedafd3f83f069ce5a360d5cb Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Wed, 22 Mar 2023 16:36:36 +0100 Subject: [PATCH] Move hellowindow and qopenglwindow to be a manual tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pick-to: 6.5 Change-Id: I8d1517ee57df9b2dee0486f47562b0754e9dcbad Reviewed-by: Christian Strømme --- examples/opengl/CMakeLists.txt | 2 -- examples/opengl/opengl.pro | 6 ++---- .../manual/examples}/opengl/hellowindow/CMakeLists.txt | 0 .../manual/examples}/opengl/hellowindow/hellowindow.cpp | 0 .../manual/examples}/opengl/hellowindow/hellowindow.h | 0 .../manual/examples}/opengl/hellowindow/hellowindow.pro | 0 .../manual/examples}/opengl/hellowindow/main.cpp | 0 .../manual/examples}/opengl/qopenglwindow/CMakeLists.txt | 0 .../manual/examples}/opengl/qopenglwindow/background.frag | 0 .../examples}/opengl/qopenglwindow/background_renderer.cpp | 0 .../examples}/opengl/qopenglwindow/background_renderer.h | 0 .../manual/examples}/opengl/qopenglwindow/main.cpp | 0 .../manual/examples}/opengl/qopenglwindow/qopenglwindow.pro | 0 .../manual/examples}/opengl/qopenglwindow/shaders.qrc | 0 14 files changed, 2 insertions(+), 6 deletions(-) rename {examples => tests/manual/examples}/opengl/hellowindow/CMakeLists.txt (100%) rename {examples => tests/manual/examples}/opengl/hellowindow/hellowindow.cpp (100%) rename {examples => tests/manual/examples}/opengl/hellowindow/hellowindow.h (100%) rename {examples => tests/manual/examples}/opengl/hellowindow/hellowindow.pro (100%) rename {examples => tests/manual/examples}/opengl/hellowindow/main.cpp (100%) rename {examples => tests/manual/examples}/opengl/qopenglwindow/CMakeLists.txt (100%) rename {examples => tests/manual/examples}/opengl/qopenglwindow/background.frag (100%) rename {examples => tests/manual/examples}/opengl/qopenglwindow/background_renderer.cpp (100%) rename {examples => tests/manual/examples}/opengl/qopenglwindow/background_renderer.h (100%) rename {examples => tests/manual/examples}/opengl/qopenglwindow/main.cpp (100%) rename {examples => tests/manual/examples}/opengl/qopenglwindow/qopenglwindow.pro (100%) rename {examples => tests/manual/examples}/opengl/qopenglwindow/shaders.qrc (100%) diff --git a/examples/opengl/CMakeLists.txt b/examples/opengl/CMakeLists.txt index b04f98e6b06..721cfec8c87 100644 --- a/examples/opengl/CMakeLists.txt +++ b/examples/opengl/CMakeLists.txt @@ -1,10 +1,8 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -qt_internal_add_example(hellowindow) qt_internal_add_example(paintedwindow) qt_internal_add_example(openglwindow) -qt_internal_add_example(qopenglwindow) if(TARGET Qt6::Widgets) qt_internal_add_example(contextinfo) qt_internal_add_example(2dpainting) diff --git a/examples/opengl/opengl.pro b/examples/opengl/opengl.pro index da07d9e4493..84b34c0ceb6 100644 --- a/examples/opengl/opengl.pro +++ b/examples/opengl/opengl.pro @@ -1,9 +1,7 @@ TEMPLATE = subdirs -SUBDIRS = hellowindow \ - paintedwindow \ - openglwindow \ - qopenglwindow +SUBDIRS = paintedwindow \ + openglwindow qtHaveModule(widgets) { SUBDIRS += contextinfo \ diff --git a/examples/opengl/hellowindow/CMakeLists.txt b/tests/manual/examples/opengl/hellowindow/CMakeLists.txt similarity index 100% rename from examples/opengl/hellowindow/CMakeLists.txt rename to tests/manual/examples/opengl/hellowindow/CMakeLists.txt diff --git a/examples/opengl/hellowindow/hellowindow.cpp b/tests/manual/examples/opengl/hellowindow/hellowindow.cpp similarity index 100% rename from examples/opengl/hellowindow/hellowindow.cpp rename to tests/manual/examples/opengl/hellowindow/hellowindow.cpp diff --git a/examples/opengl/hellowindow/hellowindow.h b/tests/manual/examples/opengl/hellowindow/hellowindow.h similarity index 100% rename from examples/opengl/hellowindow/hellowindow.h rename to tests/manual/examples/opengl/hellowindow/hellowindow.h diff --git a/examples/opengl/hellowindow/hellowindow.pro b/tests/manual/examples/opengl/hellowindow/hellowindow.pro similarity index 100% rename from examples/opengl/hellowindow/hellowindow.pro rename to tests/manual/examples/opengl/hellowindow/hellowindow.pro diff --git a/examples/opengl/hellowindow/main.cpp b/tests/manual/examples/opengl/hellowindow/main.cpp similarity index 100% rename from examples/opengl/hellowindow/main.cpp rename to tests/manual/examples/opengl/hellowindow/main.cpp diff --git a/examples/opengl/qopenglwindow/CMakeLists.txt b/tests/manual/examples/opengl/qopenglwindow/CMakeLists.txt similarity index 100% rename from examples/opengl/qopenglwindow/CMakeLists.txt rename to tests/manual/examples/opengl/qopenglwindow/CMakeLists.txt diff --git a/examples/opengl/qopenglwindow/background.frag b/tests/manual/examples/opengl/qopenglwindow/background.frag similarity index 100% rename from examples/opengl/qopenglwindow/background.frag rename to tests/manual/examples/opengl/qopenglwindow/background.frag diff --git a/examples/opengl/qopenglwindow/background_renderer.cpp b/tests/manual/examples/opengl/qopenglwindow/background_renderer.cpp similarity index 100% rename from examples/opengl/qopenglwindow/background_renderer.cpp rename to tests/manual/examples/opengl/qopenglwindow/background_renderer.cpp diff --git a/examples/opengl/qopenglwindow/background_renderer.h b/tests/manual/examples/opengl/qopenglwindow/background_renderer.h similarity index 100% rename from examples/opengl/qopenglwindow/background_renderer.h rename to tests/manual/examples/opengl/qopenglwindow/background_renderer.h diff --git a/examples/opengl/qopenglwindow/main.cpp b/tests/manual/examples/opengl/qopenglwindow/main.cpp similarity index 100% rename from examples/opengl/qopenglwindow/main.cpp rename to tests/manual/examples/opengl/qopenglwindow/main.cpp diff --git a/examples/opengl/qopenglwindow/qopenglwindow.pro b/tests/manual/examples/opengl/qopenglwindow/qopenglwindow.pro similarity index 100% rename from examples/opengl/qopenglwindow/qopenglwindow.pro rename to tests/manual/examples/opengl/qopenglwindow/qopenglwindow.pro diff --git a/examples/opengl/qopenglwindow/shaders.qrc b/tests/manual/examples/opengl/qopenglwindow/shaders.qrc similarity index 100% rename from examples/opengl/qopenglwindow/shaders.qrc rename to tests/manual/examples/opengl/qopenglwindow/shaders.qrc