diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-11-02 16:11:52 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-11-02 16:12:04 +0000 |
| commit | 25180730194bec25f915f32ab846ea583fb1493f (patch) | |
| tree | 9a73e0336ecf21e085d99d6a651c5547b9eb99f8 /examples/opengl | |
| parent | 6e3e7b9ca0548430aaa5e2555d6e02c64625fa3f (diff) | |
Rename PySide2 to PySide6
Adapt CMake files, build scripts, tests and examples.
Task-number: PYSIDE-904
Change-Id: I845f7b006e9ad274fed5444ec4c1f9dbe176ff88
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'examples/opengl')
| -rw-r--r-- | examples/opengl/contextinfo.py | 12 | ||||
| -rw-r--r-- | examples/opengl/hellogl2.py | 12 | ||||
| -rw-r--r-- | examples/opengl/textures/textures.py | 4 | ||||
| -rw-r--r-- | examples/opengl/textures/textures_rc.py | 2 |
4 files changed, 15 insertions, 15 deletions
diff --git a/examples/opengl/contextinfo.py b/examples/opengl/contextinfo.py index fce400e70..0a686d388 100644 --- a/examples/opengl/contextinfo.py +++ b/examples/opengl/contextinfo.py @@ -39,7 +39,7 @@ ## ############################################################################# -"""PySide2 port of the opengl/contextinfo example from Qt v5.x""" +"""PySide6 port of the opengl/contextinfo example from Qt v5.x""" from argparse import ArgumentParser, RawTextHelpFormatter import numpy @@ -47,13 +47,13 @@ import sys from textwrap import dedent -from PySide2.QtCore import QCoreApplication, QLibraryInfo, QSize, QTimer, Qt -from PySide2.QtGui import (QMatrix4x4, QOpenGLContext, QSurfaceFormat, QWindow) -from PySide2.QtOpenGL import (QOpenGLBuffer, QOpenGLShader, +from PySide6.QtCore import QCoreApplication, QLibraryInfo, QSize, QTimer, Qt +from PySide6.QtGui import (QMatrix4x4, QOpenGLContext, QSurfaceFormat, QWindow) +from PySide6.QtOpenGL import (QOpenGLBuffer, QOpenGLShader, QOpenGLShaderProgram, QOpenGLVertexArrayObject) -from PySide2.QtWidgets import (QApplication, QHBoxLayout, QMessageBox, QPlainTextEdit, +from PySide6.QtWidgets import (QApplication, QHBoxLayout, QMessageBox, QPlainTextEdit, QWidget) -from PySide2.support import VoidPtr +from PySide6.support import VoidPtr try: from OpenGL import GL except ImportError: diff --git a/examples/opengl/hellogl2.py b/examples/opengl/hellogl2.py index fd5d79be3..bcffdf3c9 100644 --- a/examples/opengl/hellogl2.py +++ b/examples/opengl/hellogl2.py @@ -40,20 +40,20 @@ ## ############################################################################ -"""PySide2 port of the opengl/hellogl2 example from Qt v5.x""" +"""PySide6 port of the opengl/hellogl2 example from Qt v5.x""" import sys import math import numpy import ctypes -from PySide2.QtCore import QCoreApplication, Signal, SIGNAL, SLOT, Qt, QSize, QPoint -from PySide2.QtGui import (QVector3D, QOpenGLFunctions, +from PySide6.QtCore import QCoreApplication, Signal, SIGNAL, SLOT, Qt, QSize, QPoint +from PySide6.QtGui import (QVector3D, QOpenGLFunctions, QMatrix4x4, QOpenGLContext, QSurfaceFormat) -from PySide2.QtOpenGL import (QOpenGLVertexArrayObject, QOpenGLBuffer, +from PySide6.QtOpenGL import (QOpenGLVertexArrayObject, QOpenGLBuffer, QOpenGLShaderProgram, QOpenGLShader) -from PySide2.QtWidgets import (QApplication, QWidget, QMessageBox, QHBoxLayout, +from PySide6.QtWidgets import (QApplication, QWidget, QMessageBox, QHBoxLayout, QSlider) -from PySide2.QtOpenGLWidgets import QOpenGLWidget +from PySide6.QtOpenGLWidgets import QOpenGLWidget from shiboken6 import VoidPtr diff --git a/examples/opengl/textures/textures.py b/examples/opengl/textures/textures.py index 9730cf078..e7362da1e 100644 --- a/examples/opengl/textures/textures.py +++ b/examples/opengl/textures/textures.py @@ -40,10 +40,10 @@ ## ############################################################################ -"""PySide2 port of the opengl/textures example from Qt v5.x""" +"""PySide6 port of the opengl/textures example from Qt v5.x""" import sys -from PySide2 import QtCore, QtGui, QtWidgets, QtOpenGL +from PySide6 import QtCore, QtGui, QtWidgets, QtOpenGL try: from OpenGL.GL import * diff --git a/examples/opengl/textures/textures_rc.py b/examples/opengl/textures/textures_rc.py index 1e3923f80..e68b63d69 100644 --- a/examples/opengl/textures/textures_rc.py +++ b/examples/opengl/textures/textures_rc.py @@ -3,7 +3,7 @@ # Created by: The Resource Compiler for Qt version 5.14.0 # WARNING! All changes made in this file will be lost! -from PySide2 import QtCore +from PySide6 import QtCore qt_resource_data = b"\ \x00\x00\x04\x14\ |