diff options
author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2023-02-13 08:10:29 +0100 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-02-16 07:58:44 +0000 |
commit | 7d6b144818774573e07edbd652ad2209377046b3 (patch) | |
tree | 45ae230b3cdb9684c68b038dfa06ef58d249c7c7 | |
parent | 90e2ade38721febbf2cb8897779153de4d789a10 (diff) |
Move server-buffer example to manual tests
This is undocumented and demonstrates an experimental feature which
was never maintained or exercised. It's a nice feature, so we keep
the example around for when we get the time to bring it back.
Task-number: QTBUG-110993
Change-Id: I045cb2ef02a50017a26226c493607100ea0f1b95
Reviewed-by: Inho Lee <inho.lee@qt.io>
(cherry picked from commit acb68bd3bbbc0001bcf460dd175ff92cc3ce594a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | examples/wayland/CMakeLists.txt | 3 | ||||
-rw-r--r-- | examples/wayland/wayland.pro | 5 | ||||
-rw-r--r-- | tests/manual/CMakeLists.txt | 4 | ||||
-rw-r--r-- | tests/manual/server-buffer/CMakeLists.txt (renamed from examples/wayland/server-buffer/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | tests/manual/server-buffer/README (renamed from examples/wayland/server-buffer/README) | 0 | ||||
-rw-r--r-- | tests/manual/server-buffer/compositor/CMakeLists.txt (renamed from examples/wayland/server-buffer/compositor/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | tests/manual/server-buffer/compositor/compositor.pro (renamed from examples/wayland/server-buffer/compositor/compositor.pro) | 0 | ||||
-rw-r--r-- | tests/manual/server-buffer/compositor/compositor.qrc (renamed from examples/wayland/server-buffer/compositor/compositor.qrc) | 0 | ||||
-rw-r--r-- | tests/manual/server-buffer/compositor/images/Siberischer_tiger_de_edit02.jpg (renamed from examples/wayland/server-buffer/compositor/images/Siberischer_tiger_de_edit02.jpg) | bin | 21801 -> 21801 bytes | |||
-rw-r--r-- | tests/manual/server-buffer/compositor/images/Siberischer_tiger_de_edit02.txt (renamed from examples/wayland/server-buffer/compositor/images/Siberischer_tiger_de_edit02.txt) | 0 | ||||
-rw-r--r-- | tests/manual/server-buffer/compositor/images/background.png (renamed from examples/wayland/server-buffer/compositor/images/background.png) | bin | 9528 -> 9528 bytes | |||
-rw-r--r-- | tests/manual/server-buffer/compositor/main.cpp (renamed from examples/wayland/server-buffer/compositor/main.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/server-buffer/compositor/qml/main.qml (renamed from examples/wayland/server-buffer/compositor/qml/main.qml) | 0 | ||||
-rw-r--r-- | tests/manual/server-buffer/compositor/sharebufferextension.cpp (renamed from examples/wayland/server-buffer/compositor/sharebufferextension.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/server-buffer/compositor/sharebufferextension.h (renamed from examples/wayland/server-buffer/compositor/sharebufferextension.h) | 0 | ||||
-rw-r--r-- | tests/manual/server-buffer/cpp-client/CMakeLists.txt (renamed from examples/wayland/server-buffer/cpp-client/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | tests/manual/server-buffer/cpp-client/cpp-client.pro (renamed from examples/wayland/server-buffer/cpp-client/cpp-client.pro) | 0 | ||||
-rw-r--r-- | tests/manual/server-buffer/cpp-client/main.cpp (renamed from examples/wayland/server-buffer/cpp-client/main.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/server-buffer/cpp-client/sharebufferextension.cpp (renamed from examples/wayland/server-buffer/cpp-client/sharebufferextension.cpp) | 0 | ||||
-rw-r--r-- | tests/manual/server-buffer/cpp-client/sharebufferextension.h (renamed from examples/wayland/server-buffer/cpp-client/sharebufferextension.h) | 0 | ||||
-rw-r--r-- | tests/manual/server-buffer/server-buffer.pro (renamed from examples/wayland/server-buffer/server-buffer.pro) | 0 | ||||
-rw-r--r-- | tests/manual/server-buffer/share-buffer.xml (renamed from examples/wayland/server-buffer/share-buffer.xml) | 0 |
22 files changed, 4 insertions, 8 deletions
diff --git a/examples/wayland/CMakeLists.txt b/examples/wayland/CMakeLists.txt index 2783d7a9c..93d7efa98 100644 --- a/examples/wayland/CMakeLists.txt +++ b/examples/wayland/CMakeLists.txt @@ -21,7 +21,4 @@ if(TARGET Qt::Quick AND TARGET Qt::WaylandClient) qt_internal_add_example(custom-extension) qt_internal_add_example(custom-shell) endif() -if(QT_FEATURE_opengl AND TARGET Qt::Quick AND TARGET Qt::WaylandClient) - qt_internal_add_example(server-buffer) -endif() endif() diff --git a/examples/wayland/wayland.pro b/examples/wayland/wayland.pro index 4a4aaf81d..c0ff3ec95 100644 --- a/examples/wayland/wayland.pro +++ b/examples/wayland/wayland.pro @@ -22,11 +22,6 @@ qtHaveModule(quick) { SUBDIRS += \ custom-extension \ custom-shell - - qtConfig(opengl) { - SUBDIRS += \ - server-buffer - } } SUBDIRS += hwlayer-compositor } diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt index 4393d4f14..d2f6959a6 100644 --- a/tests/manual/CMakeLists.txt +++ b/tests/manual/CMakeLists.txt @@ -12,3 +12,7 @@ if(TARGET Qt::WaylandCompositor) #add_subdirectory(wip-cpp-compositor) add_subdirectory(scaling-compositor) endif() + +if(QT_FEATURE_opengl AND TARGET Qt::Quick AND TARGET Qt::WaylandClient) + qt_internal_add_example(server-buffer) +endif() diff --git a/examples/wayland/server-buffer/CMakeLists.txt b/tests/manual/server-buffer/CMakeLists.txt index 973063c71..973063c71 100644 --- a/examples/wayland/server-buffer/CMakeLists.txt +++ b/tests/manual/server-buffer/CMakeLists.txt diff --git a/examples/wayland/server-buffer/README b/tests/manual/server-buffer/README index da20b0f50..da20b0f50 100644 --- a/examples/wayland/server-buffer/README +++ b/tests/manual/server-buffer/README diff --git a/examples/wayland/server-buffer/compositor/CMakeLists.txt b/tests/manual/server-buffer/compositor/CMakeLists.txt index 5f4fb0c51..5f4fb0c51 100644 --- a/examples/wayland/server-buffer/compositor/CMakeLists.txt +++ b/tests/manual/server-buffer/compositor/CMakeLists.txt diff --git a/examples/wayland/server-buffer/compositor/compositor.pro b/tests/manual/server-buffer/compositor/compositor.pro index 26334c63c..26334c63c 100644 --- a/examples/wayland/server-buffer/compositor/compositor.pro +++ b/tests/manual/server-buffer/compositor/compositor.pro diff --git a/examples/wayland/server-buffer/compositor/compositor.qrc b/tests/manual/server-buffer/compositor/compositor.qrc index b50594b55..b50594b55 100644 --- a/examples/wayland/server-buffer/compositor/compositor.qrc +++ b/tests/manual/server-buffer/compositor/compositor.qrc diff --git a/examples/wayland/server-buffer/compositor/images/Siberischer_tiger_de_edit02.jpg b/tests/manual/server-buffer/compositor/images/Siberischer_tiger_de_edit02.jpg Binary files differindex eb1b73f84..eb1b73f84 100644 --- a/examples/wayland/server-buffer/compositor/images/Siberischer_tiger_de_edit02.jpg +++ b/tests/manual/server-buffer/compositor/images/Siberischer_tiger_de_edit02.jpg diff --git a/examples/wayland/server-buffer/compositor/images/Siberischer_tiger_de_edit02.txt b/tests/manual/server-buffer/compositor/images/Siberischer_tiger_de_edit02.txt index 3a26c00d3..3a26c00d3 100644 --- a/examples/wayland/server-buffer/compositor/images/Siberischer_tiger_de_edit02.txt +++ b/tests/manual/server-buffer/compositor/images/Siberischer_tiger_de_edit02.txt diff --git a/examples/wayland/server-buffer/compositor/images/background.png b/tests/manual/server-buffer/compositor/images/background.png Binary files differindex 292160cd8..292160cd8 100644 --- a/examples/wayland/server-buffer/compositor/images/background.png +++ b/tests/manual/server-buffer/compositor/images/background.png diff --git a/examples/wayland/server-buffer/compositor/main.cpp b/tests/manual/server-buffer/compositor/main.cpp index 3c33620c5..3c33620c5 100644 --- a/examples/wayland/server-buffer/compositor/main.cpp +++ b/tests/manual/server-buffer/compositor/main.cpp diff --git a/examples/wayland/server-buffer/compositor/qml/main.qml b/tests/manual/server-buffer/compositor/qml/main.qml index 484a9563c..484a9563c 100644 --- a/examples/wayland/server-buffer/compositor/qml/main.qml +++ b/tests/manual/server-buffer/compositor/qml/main.qml diff --git a/examples/wayland/server-buffer/compositor/sharebufferextension.cpp b/tests/manual/server-buffer/compositor/sharebufferextension.cpp index b1b499ffa..b1b499ffa 100644 --- a/examples/wayland/server-buffer/compositor/sharebufferextension.cpp +++ b/tests/manual/server-buffer/compositor/sharebufferextension.cpp diff --git a/examples/wayland/server-buffer/compositor/sharebufferextension.h b/tests/manual/server-buffer/compositor/sharebufferextension.h index 98dcc7d83..98dcc7d83 100644 --- a/examples/wayland/server-buffer/compositor/sharebufferextension.h +++ b/tests/manual/server-buffer/compositor/sharebufferextension.h diff --git a/examples/wayland/server-buffer/cpp-client/CMakeLists.txt b/tests/manual/server-buffer/cpp-client/CMakeLists.txt index 01c0df44f..01c0df44f 100644 --- a/examples/wayland/server-buffer/cpp-client/CMakeLists.txt +++ b/tests/manual/server-buffer/cpp-client/CMakeLists.txt diff --git a/examples/wayland/server-buffer/cpp-client/cpp-client.pro b/tests/manual/server-buffer/cpp-client/cpp-client.pro index 6ac551323..6ac551323 100644 --- a/examples/wayland/server-buffer/cpp-client/cpp-client.pro +++ b/tests/manual/server-buffer/cpp-client/cpp-client.pro diff --git a/examples/wayland/server-buffer/cpp-client/main.cpp b/tests/manual/server-buffer/cpp-client/main.cpp index 8adac2520..8adac2520 100644 --- a/examples/wayland/server-buffer/cpp-client/main.cpp +++ b/tests/manual/server-buffer/cpp-client/main.cpp diff --git a/examples/wayland/server-buffer/cpp-client/sharebufferextension.cpp b/tests/manual/server-buffer/cpp-client/sharebufferextension.cpp index 3641ec636..3641ec636 100644 --- a/examples/wayland/server-buffer/cpp-client/sharebufferextension.cpp +++ b/tests/manual/server-buffer/cpp-client/sharebufferextension.cpp diff --git a/examples/wayland/server-buffer/cpp-client/sharebufferextension.h b/tests/manual/server-buffer/cpp-client/sharebufferextension.h index 78e3ca7f1..78e3ca7f1 100644 --- a/examples/wayland/server-buffer/cpp-client/sharebufferextension.h +++ b/tests/manual/server-buffer/cpp-client/sharebufferextension.h diff --git a/examples/wayland/server-buffer/server-buffer.pro b/tests/manual/server-buffer/server-buffer.pro index 0c737ea8c..0c737ea8c 100644 --- a/examples/wayland/server-buffer/server-buffer.pro +++ b/tests/manual/server-buffer/server-buffer.pro diff --git a/examples/wayland/server-buffer/share-buffer.xml b/tests/manual/server-buffer/share-buffer.xml index 53020c4e9..53020c4e9 100644 --- a/examples/wayland/server-buffer/share-buffer.xml +++ b/tests/manual/server-buffer/share-buffer.xml |