From cd7995de57321854b1da01e07ba49e82520abfe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 26 Jun 2023 17:55:21 +0200 Subject: [PATCH] Move windowcontainer example to manual test Pick-to: 6.5 6.6 Change-Id: I68b866bcc2659b90aad2c10dc06240674bf4a826 Reviewed-by: Richard Moe Gustavsen --- examples/widgets/CMakeLists.txt | 3 --- examples/widgets/widgets.pro | 3 --- .../manual/examples}/widgets/windowcontainer/CMakeLists.txt | 0 .../examples}/widgets/windowcontainer/windowcontainer.cpp | 0 .../examples}/widgets/windowcontainer/windowcontainer.pro | 0 5 files changed, 6 deletions(-) rename {examples => tests/manual/examples}/widgets/windowcontainer/CMakeLists.txt (100%) rename {examples => tests/manual/examples}/widgets/windowcontainer/windowcontainer.cpp (100%) rename {examples => tests/manual/examples}/widgets/windowcontainer/windowcontainer.pro (100%) diff --git a/examples/widgets/CMakeLists.txt b/examples/widgets/CMakeLists.txt index c5b81e81a4..c5d3de8b34 100644 --- a/examples/widgets/CMakeLists.txt +++ b/examples/widgets/CMakeLists.txt @@ -26,6 +26,3 @@ endif() if(QT_FEATURE_cursor) add_subdirectory(mainwindows) endif() -if(QT_FEATURE_opengl AND TARGET Qt6::Gui) - qt_internal_add_example(windowcontainer) -endif() diff --git a/examples/widgets/widgets.pro b/examples/widgets/widgets.pro index 3d8a6d38d3..8818582105 100644 --- a/examples/widgets/widgets.pro +++ b/examples/widgets/widgets.pro @@ -21,9 +21,6 @@ SUBDIRS = \ tutorials \ widgets -qtHaveModule(gui):qtConfig(opengl): \ - SUBDIRS += windowcontainer - contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows !qtConfig(draganddrop): SUBDIRS -= draganddrop !qtConfig(animation): SUBDIRS -= animation diff --git a/examples/widgets/windowcontainer/CMakeLists.txt b/tests/manual/examples/widgets/windowcontainer/CMakeLists.txt similarity index 100% rename from examples/widgets/windowcontainer/CMakeLists.txt rename to tests/manual/examples/widgets/windowcontainer/CMakeLists.txt diff --git a/examples/widgets/windowcontainer/windowcontainer.cpp b/tests/manual/examples/widgets/windowcontainer/windowcontainer.cpp similarity index 100% rename from examples/widgets/windowcontainer/windowcontainer.cpp rename to tests/manual/examples/widgets/windowcontainer/windowcontainer.cpp diff --git a/examples/widgets/windowcontainer/windowcontainer.pro b/tests/manual/examples/widgets/windowcontainer/windowcontainer.pro similarity index 100% rename from examples/widgets/windowcontainer/windowcontainer.pro rename to tests/manual/examples/widgets/windowcontainer/windowcontainer.pro