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