From 4ee18ba27bb63f8dd3d7772b67f21c7aa7817e5c Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 6 Oct 2020 16:39:07 +0200 Subject: Fix some tests - QOpenGLBuffer has been moved to QtOpenGL - QPrinter no longer has API for the margins taking tuples Task-number: PYSIDE-1339 Task-number: PYSIDE-904 Change-Id: I8cc6661f754f0cda3fecc56a9a7243f7501e56b9 Reviewed-by: Christian Tismer --- .../pyside2/tests/QtOpenGL/qopenglbuffer_test.py | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'sources/pyside2/tests/QtOpenGL/qopenglbuffer_test.py') diff --git a/sources/pyside2/tests/QtOpenGL/qopenglbuffer_test.py b/sources/pyside2/tests/QtOpenGL/qopenglbuffer_test.py index a5d8385c9..5500c7c57 100644 --- a/sources/pyside2/tests/QtOpenGL/qopenglbuffer_test.py +++ b/sources/pyside2/tests/QtOpenGL/qopenglbuffer_test.py @@ -38,50 +38,50 @@ from init_paths import init_test_paths init_test_paths(False) from helper.usesqapplication import UsesQApplication -from PySide2.QtGui import QOpenGLBuffer -from PySide2 import QtGui +from PySide2.QtGui import QOffscreenSurface, QOpenGLContext, QSurface, QWindow +from PySide2.QtOpenGL import QOpenGLBuffer def createSurface(surfaceClass): - if surfaceClass == QtGui.QSurface.Window: - window = QtGui.QWindow() - window.setSurfaceType(QtGui.QWindow.OpenGLSurface) + if surfaceClass == QSurface.Window: + window = QWindow() + window.setSurfaceType(QWindow.OpenGLSurface) window.setGeometry(0, 0, 10, 10) window.create() return window - elif surfaceClass == QtGui.QSurface.Offscreen: + elif surfaceClass == QSurface.Offscreen: # Create a window and get the format from that. For example, if an EGL # implementation provides 565 and 888 configs for PBUFFER_BIT but only # 888 for WINDOW_BIT, we may end up with a pbuffer surface that is # incompatible with the context since it could choose the 565 while the # window and the context uses a config with 888. - format = QtGui.QSurfaceFormat + format = QSurfaceFormat if format.redBufferSize() == -1: - window = QtGui.QWindow() - window.setSurfaceType(QtGui.QWindow.OpenGLSurface) + window = QWindow() + window.setSurfaceType(QWindow.OpenGLSurface) window.setGeometry(0, 0, 10, 10) window.create() format = window.format() - offscreenSurface = QtGui.QOffscreenSurface() + offscreenSurface = QOffscreenSurface() offscreenSurface.setFormat(format) offscreenSurface.create() return offscreenSurface return 0 -class QOpenGLBuffer(UsesQApplication): +class QOpenGLBufferTest(UsesQApplication): def testBufferCreate(self): - surface = createSurface(QtGui.QSurface.Window) - ctx = QtGui.QOpenGLContext() + surface = createSurface(QSurface.Window) + ctx = QOpenGLContext() ctx.create() ctx.makeCurrent(surface) - buf = QtGui.QOpenGLBuffer() + buf = QOpenGLBuffer() self.assertTrue(not buf.isCreated()) self.assertTrue(buf.create()) self.assertTrue(buf.isCreated()) - self.assertEqual(buf.type(), QtGui.QOpenGLBuffer.VertexBuffer) + self.assertEqual(buf.type(), QOpenGLBuffer.VertexBuffer) buf.bind() buf.allocate(128) -- cgit v1.2.3