examples: Remove opengl example

We should not have examples that are specific to opengl on Windows.

In order to keep the use case's code in source, the example was moved to
tests/manual.

Pick-to: 6.5
Change-Id: Ie55aea777c449913e66279728c53f08c4105b66c
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

15 files changed, 27 insertions, 41 deletions

diff --git a/examples/activeqt/CMakeLists.txt b/examples/activeqt/CMakeLists.txt
index f63a35a..5604df2 100644
--- a/examples/activeqt/CMakeLists.txt
+++ b/examples/activeqt/CMakeLists.txt
@@ -5,9 +5,6 @@ if(MSVC)
     qt_internal_add_example(comapp)
     qt_internal_add_example(simple)
     qt_internal_add_example(wrapper)
-    if(TARGET Qt6::OpenGLWidgets AND QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2)
-        qt_internal_add_example(opengl)
-    endif()
     if(TARGET Qt::QuickControls2)
         qt_internal_add_example(simpleqml)
     endif()
diff --git a/examples/activeqt/activeqt.pro b/examples/activeqt/activeqt.pro
index c42a2aa..ee5a663 100644
--- a/examples/activeqt/activeqt.pro
+++ b/examples/activeqt/activeqt.pro
@@ -3,5 +3,4 @@ SUBDIRS      += comapp \
                 simple \
                 wrapper
 
-contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles2): SUBDIRS += opengl
 qtHaveModule(quickcontrols2):SUBDIRS += simpleqml
diff --git a/examples/activeqt/opengl/CMakeLists.txt b/examples/activeqt/opengl/CMakeLists.txt
deleted file mode 100644
index 7627048..0000000
--- a/examples/activeqt/opengl/CMakeLists.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
-
-cmake_minimum_required(VERSION 3.16)
-project(openglax LANGUAGES CXX)
-
-set(CMAKE_AUTOMOC ON)
-
-if(NOT DEFINED INSTALL_EXAMPLESDIR)
-    set(INSTALL_EXAMPLESDIR "examples")
-endif()
-
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/activeqt/opengl")
-
-find_package(Qt6 REQUIRED COMPONENTS AxServer Core Gui OpenGL OpenGLWidgets Widgets)
-
-qt6_add_axserver_executable(openglax
-    glbox.cpp glbox.h
-    globjwin.cpp globjwin.h
-    main.cpp
-    opengl.def
-    opengl.rc
-)
-
-target_link_libraries(openglax PUBLIC
-    Qt::Core
-    Qt::Gui
-    Qt::OpenGL
-    Qt::OpenGLWidgets
-    Qt::Widgets
-)
-
-install(TARGETS openglax
-    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
-    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
-    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
-)
diff --git a/tests/manual/opengl/CMakeLists.txt b/tests/manual/opengl/CMakeLists.txt
new file mode 100644
index 0000000..e8e4255
--- /dev/null
+++ b/tests/manual/opengl/CMakeLists.txt
@@ -0,0 +1,27 @@
+# Copyright (C) 2023 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+#####################################################################
+## testcontrol Binary:
+#####################################################################
+
+set(CMAKE_AUTOMOC ON)
+
+qt_internal_add_manual_test(tst_opengl
+    GUI
+    SOURCES
+        glbox.cpp glbox.h
+        globjwin.cpp globjwin.h
+        main.cpp
+        opengl.def
+        opengl.rc
+    LIBRARIES
+        Qt::AxServer
+        Qt::Gui
+        Qt::OpenGL
+        Qt::OpenGLWidgets
+        Qt::Widgets
+)
+
+# qt_disable_warnings(tst_opengl)
+qt6_target_idl(tst_opengl)
diff --git a/examples/activeqt/opengl/doc/src/opengl.qdoc b/tests/manual/opengl/doc/src/opengl.qdoc
index 2558363..2558363 100644
--- a/examples/activeqt/opengl/doc/src/opengl.qdoc
+++ b/tests/manual/opengl/doc/src/opengl.qdoc
diff --git a/examples/activeqt/opengl/glbox.cpp b/tests/manual/opengl/glbox.cpp
index 3388670..3388670 100644
--- a/examples/activeqt/opengl/glbox.cpp
+++ b/tests/manual/opengl/glbox.cpp
diff --git a/examples/activeqt/opengl/glbox.h b/tests/manual/opengl/glbox.h
index a1b58da..a1b58da 100644
--- a/examples/activeqt/opengl/glbox.h
+++ b/tests/manual/opengl/glbox.h
diff --git a/examples/activeqt/opengl/globjwin.cpp b/tests/manual/opengl/globjwin.cpp
index 0b9cea1..0b9cea1 100644
--- a/examples/activeqt/opengl/globjwin.cpp
+++ b/tests/manual/opengl/globjwin.cpp
diff --git a/examples/activeqt/opengl/globjwin.h b/tests/manual/opengl/globjwin.h
index 58ff614..58ff614 100644
--- a/examples/activeqt/opengl/globjwin.h
+++ b/tests/manual/opengl/globjwin.h
diff --git a/examples/activeqt/opengl/main.cpp b/tests/manual/opengl/main.cpp
index 2f78324..2f78324 100644
--- a/examples/activeqt/opengl/main.cpp
+++ b/tests/manual/opengl/main.cpp
diff --git a/examples/activeqt/opengl/opengl.def b/tests/manual/opengl/opengl.def
index bc82a03..bc82a03 100644
--- a/examples/activeqt/opengl/opengl.def
+++ b/tests/manual/opengl/opengl.def
diff --git a/examples/activeqt/opengl/opengl.ico b/tests/manual/opengl/opengl.ico
index c80d36a..c80d36a 100644
--- a/examples/activeqt/opengl/opengl.ico
+++ b/tests/manual/opengl/opengl.ico
diff --git a/examples/activeqt/opengl/opengl.inf b/tests/manual/opengl/opengl.inf
index 4a79e67..4a79e67 100644
--- a/examples/activeqt/opengl/opengl.inf
+++ b/tests/manual/opengl/opengl.inf
diff --git a/examples/activeqt/opengl/opengl.pro b/tests/manual/opengl/opengl.pro
index 1ece9b9..1ece9b9 100644
--- a/examples/activeqt/opengl/opengl.pro
+++ b/tests/manual/opengl/opengl.pro
diff --git a/examples/activeqt/opengl/opengl.rc b/tests/manual/opengl/opengl.rc
index 02c0898..02c0898 100644
--- a/examples/activeqt/opengl/opengl.rc
+++ b/tests/manual/opengl/opengl.rc