Re-add QtOpenGL

Open GL functionality has been moved from QtGui to QtOpenGL in Qt 6.

Task-number: PYSIDE-1339
Task-number: PYSIDE-904
Change-Id: Iecfc70d24bd694b09622554cc6b6762795243d5c
Reviewed-by: Cristian Maureira-Fredes <[email protected]>

4 files changed, 3 insertions, 135 deletions

diff --git a/sources/pyside2/tests/QtOpenGL/CMakeLists.txt b/sources/pyside2/tests/QtOpenGL/CMakeLists.txt
index a0e8d0053..92b4afbac 100644
--- a/sources/pyside2/tests/QtOpenGL/CMakeLists.txt
+++ b/sources/pyside2/tests/QtOpenGL/CMakeLists.txt
@@ -1,4 +1,2 @@
-PYSIDE_TEST(qglbuffer_test.py)
-PYSIDE_TEST(qglwidget_test.py)
 PYSIDE_TEST(qopenglbuffer_test.py)
 PYSIDE_TEST(qopenglwindow_test.py)
diff --git a/sources/pyside2/tests/QtOpenGL/qglbuffer_test.py b/sources/pyside2/tests/QtOpenGL/qglbuffer_test.py
deleted file mode 100644
index e633d6ee2..000000000
--- a/sources/pyside2/tests/QtOpenGL/qglbuffer_test.py
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/python
-
-#############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the test suite of Qt for Python.
-##
-## $QT_BEGIN_LICENSE:GPL-EXCEPT$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 as published by the Free Software
-## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-'''Unit tests for QGLBuffer'''
-
-import os
-import sys
-import unittest
-
-sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-from init_paths import init_test_paths
-init_test_paths(False)
-
-from PySide2.QtCore import QByteArray
-from PySide2.QtOpenGL import QGLBuffer, QGLWidget
-import py3kcompat as py3k
-from helper.usesqapplication import UsesQApplication
-
-class QGLBufferTest(UsesQApplication):
-    def testIt(self):
-        w = QGLWidget()
-        w.makeCurrent()
-
-        b = QGLBuffer()
-        b.setUsagePattern(QGLBuffer.DynamicDraw)
-
-        self.assertTrue(b.create())
-        self.assertTrue(b.bufferId() != 0)
-        self.assertTrue(b.bind())
-
-        data = QByteArray(py3k.b("12345"))
-        b.allocate(data)
-        self.assertEqual(b.size(), data.size())
-
-        m = b.map(QGLBuffer.ReadOnly)
-        if m:
-            self.assertEqual(m, py3k.buffer(py3k.b(data.data())))
-            b.unmap()
-
-            m = b.map(QGLBuffer.ReadWrite)
-            m[3] = py3k.b('A')[0]
-            b.unmap()
-            result, rdata = b.read(3, 1)
-            self.assertTrue(result)
-            self.assertEqual(py3k.b('A'), rdata.data())
-        else:
-            print(" memory mapping is not possible in this OpenGL implementation.")
-        b.release()
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/sources/pyside2/tests/QtOpenGL/qglwidget_test.py b/sources/pyside2/tests/QtOpenGL/qglwidget_test.py
deleted file mode 100644
index c3bb7e27d..000000000
--- a/sources/pyside2/tests/QtOpenGL/qglwidget_test.py
+++ /dev/null
@@ -1,54 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the test suite of Qt for Python.
-##
-## $QT_BEGIN_LICENSE:GPL-EXCEPT$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 as published by the Free Software
-## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-import os
-import sys
-import unittest
-
-sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-from init_paths import init_test_paths
-init_test_paths(False)
-
-from PySide2.QtGui import *
-from PySide2.QtWidgets import *
-from PySide2.QtOpenGL import *
-
-class TestQGLWidget (unittest.TestCase):
-    def testIt(self):
-        """Just test if the bindTexture(*, GLenum, GLint) methods overloads exists"""
-        app = QApplication([])
-        img = QImage()
-        w = QGLWidget()
-        a = w.bindTexture(img, 0, 0) # ok if it throws nothing.. :-)
-
-
-
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/sources/pyside2/tests/QtGui/qopenglwindow_test.py b/sources/pyside2/tests/QtOpenGL/qopenglwindow_test.py
index e39cfb19c..22f7fd202 100644
--- a/sources/pyside2/tests/QtGui/qopenglwindow_test.py
+++ b/sources/pyside2/tests/QtOpenGL/qopenglwindow_test.py
@@ -40,7 +40,9 @@ from helper.usesqapplication import UsesQApplication
 
 from PySide2.QtCore import QSize, QTimer, Qt
 from PySide2.QtGui import (QColor, QGuiApplication, QImage, QOpenGLContext,
-    QOpenGLTexture, QSurfaceFormat, QOpenGLWindow)
+    QSurfaceFormat)
+from PySide2.QtOpenGL import (QOpenGLTexture, QOpenGLWindow)
+
 
 try:
     from OpenGL import GL