From 6c96218b43667ae47364f303b566be6e0e5779fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 13 Jun 2023 14:22:48 +0200 Subject: [PATCH] Move qpa examples to manual tests Pick-to: 6.6 6.5 Change-Id: I7b25b1c8100f04eec3d9a571f59a1babef55b1d5 Reviewed-by: Volker Hilsheimer --- examples/CMakeLists.txt | 1 - examples/examples.pro | 3 +-- {examples => tests/manual/examples}/qpa/CMakeLists.txt | 0 {examples => tests/manual/examples}/qpa/qpa.pro | 0 .../manual/examples}/qpa/qrasterwindow/CMakeLists.txt | 0 {examples => tests/manual/examples}/qpa/qrasterwindow/main.cpp | 0 .../manual/examples}/qpa/qrasterwindow/qrasterwindow.pro | 0 {examples => tests/manual/examples}/qpa/windows/CMakeLists.txt | 0 {examples => tests/manual/examples}/qpa/windows/main.cpp | 0 {examples => tests/manual/examples}/qpa/windows/window.cpp | 0 {examples => tests/manual/examples}/qpa/windows/window.h | 0 {examples => tests/manual/examples}/qpa/windows/windows.pro | 0 12 files changed, 1 insertion(+), 3 deletions(-) rename {examples => tests/manual/examples}/qpa/CMakeLists.txt (100%) rename {examples => tests/manual/examples}/qpa/qpa.pro (100%) rename {examples => tests/manual/examples}/qpa/qrasterwindow/CMakeLists.txt (100%) rename {examples => tests/manual/examples}/qpa/qrasterwindow/main.cpp (100%) rename {examples => tests/manual/examples}/qpa/qrasterwindow/qrasterwindow.pro (100%) rename {examples => tests/manual/examples}/qpa/windows/CMakeLists.txt (100%) rename {examples => tests/manual/examples}/qpa/windows/main.cpp (100%) rename {examples => tests/manual/examples}/qpa/windows/window.cpp (100%) rename {examples => tests/manual/examples}/qpa/windows/window.h (100%) rename {examples => tests/manual/examples}/qpa/windows/windows.pro (100%) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 2bc1e4d378..0f6e6ba425 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -5,7 +5,6 @@ qt_examples_build_begin(EXTERNAL_BUILD) add_subdirectory(corelib) add_subdirectory(embedded) -add_subdirectory(qpa) if(TARGET Qt6::DBus) add_subdirectory(dbus) endif() diff --git a/examples/examples.pro b/examples/examples.pro index fe6c6dc7d4..15e8167f32 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -3,8 +3,7 @@ CONFIG += no_docs_target SUBDIRS = \ corelib \ - embedded \ - qpa + embedded !contains(TEMPLATE, "vc.*") { # QTBUG-91033 qtHaveModule(dbus): SUBDIRS += dbus diff --git a/examples/qpa/CMakeLists.txt b/tests/manual/examples/qpa/CMakeLists.txt similarity index 100% rename from examples/qpa/CMakeLists.txt rename to tests/manual/examples/qpa/CMakeLists.txt diff --git a/examples/qpa/qpa.pro b/tests/manual/examples/qpa/qpa.pro similarity index 100% rename from examples/qpa/qpa.pro rename to tests/manual/examples/qpa/qpa.pro diff --git a/examples/qpa/qrasterwindow/CMakeLists.txt b/tests/manual/examples/qpa/qrasterwindow/CMakeLists.txt similarity index 100% rename from examples/qpa/qrasterwindow/CMakeLists.txt rename to tests/manual/examples/qpa/qrasterwindow/CMakeLists.txt diff --git a/examples/qpa/qrasterwindow/main.cpp b/tests/manual/examples/qpa/qrasterwindow/main.cpp similarity index 100% rename from examples/qpa/qrasterwindow/main.cpp rename to tests/manual/examples/qpa/qrasterwindow/main.cpp diff --git a/examples/qpa/qrasterwindow/qrasterwindow.pro b/tests/manual/examples/qpa/qrasterwindow/qrasterwindow.pro similarity index 100% rename from examples/qpa/qrasterwindow/qrasterwindow.pro rename to tests/manual/examples/qpa/qrasterwindow/qrasterwindow.pro diff --git a/examples/qpa/windows/CMakeLists.txt b/tests/manual/examples/qpa/windows/CMakeLists.txt similarity index 100% rename from examples/qpa/windows/CMakeLists.txt rename to tests/manual/examples/qpa/windows/CMakeLists.txt diff --git a/examples/qpa/windows/main.cpp b/tests/manual/examples/qpa/windows/main.cpp similarity index 100% rename from examples/qpa/windows/main.cpp rename to tests/manual/examples/qpa/windows/main.cpp diff --git a/examples/qpa/windows/window.cpp b/tests/manual/examples/qpa/windows/window.cpp similarity index 100% rename from examples/qpa/windows/window.cpp rename to tests/manual/examples/qpa/windows/window.cpp diff --git a/examples/qpa/windows/window.h b/tests/manual/examples/qpa/windows/window.h similarity index 100% rename from examples/qpa/windows/window.h rename to tests/manual/examples/qpa/windows/window.h diff --git a/examples/qpa/windows/windows.pro b/tests/manual/examples/qpa/windows/windows.pro similarity index 100% rename from examples/qpa/windows/windows.pro rename to tests/manual/examples/qpa/windows/windows.pro