diff options
| -rw-r--r-- | examples/opengl/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/opengl/opengl.pro | 6 | ||||
| -rw-r--r-- | tests/manual/examples/opengl/hellowindow/CMakeLists.txt (renamed from examples/opengl/hellowindow/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | tests/manual/examples/opengl/hellowindow/hellowindow.cpp (renamed from examples/opengl/hellowindow/hellowindow.cpp) | 0 | ||||
| -rw-r--r-- | tests/manual/examples/opengl/hellowindow/hellowindow.h (renamed from examples/opengl/hellowindow/hellowindow.h) | 0 | ||||
| -rw-r--r-- | tests/manual/examples/opengl/hellowindow/hellowindow.pro (renamed from examples/opengl/hellowindow/hellowindow.pro) | 0 | ||||
| -rw-r--r-- | tests/manual/examples/opengl/hellowindow/main.cpp (renamed from examples/opengl/hellowindow/main.cpp) | 0 | ||||
| -rw-r--r-- | tests/manual/examples/opengl/qopenglwindow/CMakeLists.txt (renamed from examples/opengl/qopenglwindow/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | tests/manual/examples/opengl/qopenglwindow/background.frag (renamed from examples/opengl/qopenglwindow/background.frag) | 0 | ||||
| -rw-r--r-- | tests/manual/examples/opengl/qopenglwindow/background_renderer.cpp (renamed from examples/opengl/qopenglwindow/background_renderer.cpp) | 0 | ||||
| -rw-r--r-- | tests/manual/examples/opengl/qopenglwindow/background_renderer.h (renamed from examples/opengl/qopenglwindow/background_renderer.h) | 0 | ||||
| -rw-r--r-- | tests/manual/examples/opengl/qopenglwindow/main.cpp (renamed from examples/opengl/qopenglwindow/main.cpp) | 0 | ||||
| -rw-r--r-- | tests/manual/examples/opengl/qopenglwindow/qopenglwindow.pro (renamed from examples/opengl/qopenglwindow/qopenglwindow.pro) | 0 | ||||
| -rw-r--r-- | tests/manual/examples/opengl/qopenglwindow/shaders.qrc (renamed from examples/opengl/qopenglwindow/shaders.qrc) | 0 |
14 files changed, 2 insertions, 6 deletions
diff --git a/examples/opengl/CMakeLists.txt b/examples/opengl/CMakeLists.txt index b04f98e6b0..721cfec8c8 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 da07d9e449..84b34c0ceb 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 index 551cf9faef..551cf9faef 100644 --- a/examples/opengl/hellowindow/CMakeLists.txt +++ b/tests/manual/examples/opengl/hellowindow/CMakeLists.txt diff --git a/examples/opengl/hellowindow/hellowindow.cpp b/tests/manual/examples/opengl/hellowindow/hellowindow.cpp index c9cad95563..c9cad95563 100644 --- a/examples/opengl/hellowindow/hellowindow.cpp +++ b/tests/manual/examples/opengl/hellowindow/hellowindow.cpp diff --git a/examples/opengl/hellowindow/hellowindow.h b/tests/manual/examples/opengl/hellowindow/hellowindow.h index 1e117ab2e0..1e117ab2e0 100644 --- a/examples/opengl/hellowindow/hellowindow.h +++ b/tests/manual/examples/opengl/hellowindow/hellowindow.h diff --git a/examples/opengl/hellowindow/hellowindow.pro b/tests/manual/examples/opengl/hellowindow/hellowindow.pro index 27c274a378..27c274a378 100644 --- a/examples/opengl/hellowindow/hellowindow.pro +++ b/tests/manual/examples/opengl/hellowindow/hellowindow.pro diff --git a/examples/opengl/hellowindow/main.cpp b/tests/manual/examples/opengl/hellowindow/main.cpp index ee4729a493..ee4729a493 100644 --- a/examples/opengl/hellowindow/main.cpp +++ b/tests/manual/examples/opengl/hellowindow/main.cpp diff --git a/examples/opengl/qopenglwindow/CMakeLists.txt b/tests/manual/examples/opengl/qopenglwindow/CMakeLists.txt index f1c407ce17..f1c407ce17 100644 --- a/examples/opengl/qopenglwindow/CMakeLists.txt +++ b/tests/manual/examples/opengl/qopenglwindow/CMakeLists.txt diff --git a/examples/opengl/qopenglwindow/background.frag b/tests/manual/examples/opengl/qopenglwindow/background.frag index 4af85aae8e..4af85aae8e 100644 --- a/examples/opengl/qopenglwindow/background.frag +++ b/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 index 5939894dfe..5939894dfe 100644 --- a/examples/opengl/qopenglwindow/background_renderer.cpp +++ b/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 index 76c0bec6a8..76c0bec6a8 100644 --- a/examples/opengl/qopenglwindow/background_renderer.h +++ b/tests/manual/examples/opengl/qopenglwindow/background_renderer.h diff --git a/examples/opengl/qopenglwindow/main.cpp b/tests/manual/examples/opengl/qopenglwindow/main.cpp index 44810a4ecf..44810a4ecf 100644 --- a/examples/opengl/qopenglwindow/main.cpp +++ b/tests/manual/examples/opengl/qopenglwindow/main.cpp diff --git a/examples/opengl/qopenglwindow/qopenglwindow.pro b/tests/manual/examples/opengl/qopenglwindow/qopenglwindow.pro index e7073a324b..e7073a324b 100644 --- a/examples/opengl/qopenglwindow/qopenglwindow.pro +++ b/tests/manual/examples/opengl/qopenglwindow/qopenglwindow.pro diff --git a/examples/opengl/qopenglwindow/shaders.qrc b/tests/manual/examples/opengl/qopenglwindow/shaders.qrc index 64eefe2c70..64eefe2c70 100644 --- a/examples/opengl/qopenglwindow/shaders.qrc +++ b/tests/manual/examples/opengl/qopenglwindow/shaders.qrc |