From 53a44ce0343f46bd6ad0b0148fd0231b541376ba Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 10 Aug 2022 21:07:04 +0530 Subject: [PATCH] Make QtOpenGL importable from qt.core --- src/qt/__init__.py | 2 +- src/qt/__main__.py | 2 ++ src/qt/core.pyi | 29 +++++++++++++++++++++++++++- src/qt/core_name_map.py | 37 +++++++++++++++++++++++++++++++++++- src/qt/webengine.pyi | 3 +++ src/qt/webengine_name_map.py | 5 ++++- 6 files changed, 74 insertions(+), 4 deletions(-) diff --git a/src/qt/__init__.py b/src/qt/__init__.py index fa610e4a66..f85c2c3ada 100644 --- a/src/qt/__init__.py +++ b/src/qt/__init__.py @@ -1,5 +1,5 @@ # autogenerated by __main__.py do not edit -top_level_module_names=('QtCore', 'QtGui', 'QtWidgets', 'QtNetwork', 'QtSvg', 'QtPrintSupport', 'QtWebEngineCore', 'QtWebEngineWidgets', 'QtDBus') +top_level_module_names=('QtCore', 'QtGui', 'QtWidgets', 'QtNetwork', 'QtSvg', 'QtPrintSupport', 'QtOpenGL', 'QtOpenGLWidgets', 'QtWebEngineCore', 'QtWebEngineWidgets', 'QtDBus') def __getattr__(name): diff --git a/src/qt/__main__.py b/src/qt/__main__.py index 35bfdcd148..78bea62583 100644 --- a/src/qt/__main__.py +++ b/src/qt/__main__.py @@ -17,6 +17,8 @@ module_lists = { 'QtNetwork', 'QtSvg', 'QtPrintSupport', + 'QtOpenGL', + 'QtOpenGLWidgets', ), 'webengine': ( 'QtWebEngineCore', diff --git a/src/qt/core.pyi b/src/qt/core.pyi index 6637623bb2..d1f4e1a458 100644 --- a/src/qt/core.pyi +++ b/src/qt/core.pyi @@ -86,6 +86,7 @@ QMutexLocker = PyQt6.QtCore.QMutexLocker QObject = PyQt6.QtCore.QObject QObjectCleanupHandler = PyQt6.QtCore.QObjectCleanupHandler QOperatingSystemVersion = PyQt6.QtCore.QOperatingSystemVersion +QOperatingSystemVersionBase = PyQt6.QtCore.QOperatingSystemVersionBase QParallelAnimationGroup = PyQt6.QtCore.QParallelAnimationGroup QPauseAnimation = PyQt6.QtCore.QPauseAnimation QPersistentModelIndex = PyQt6.QtCore.QPersistentModelIndex @@ -198,6 +199,7 @@ qIsFinite = PyQt6.QtCore.qIsFinite qIsInf = PyQt6.QtCore.qIsInf qIsNaN = PyQt6.QtCore.qIsNaN qQNaN = PyQt6.QtCore.qQNaN +qRegisterResourceData = PyQt6.QtCore.qRegisterResourceData qRemovePostRoutine = PyQt6.QtCore.qRemovePostRoutine qRound = PyQt6.QtCore.qRound qRound64 = PyQt6.QtCore.qRound64 @@ -207,6 +209,7 @@ qSetMessagePattern = PyQt6.QtCore.qSetMessagePattern qSetPadChar = PyQt6.QtCore.qSetPadChar qSetRealNumberPrecision = PyQt6.QtCore.qSetRealNumberPrecision qUncompress = PyQt6.QtCore.qUncompress +qUnregisterResourceData = PyQt6.QtCore.qUnregisterResourceData qVersion = PyQt6.QtCore.qVersion qWarning = PyQt6.QtCore.qWarning import PyQt6.QtGui @@ -646,4 +649,28 @@ QPrintEngine = PyQt6.QtPrintSupport.QPrintEngine QPrintPreviewDialog = PyQt6.QtPrintSupport.QPrintPreviewDialog QPrintPreviewWidget = PyQt6.QtPrintSupport.QPrintPreviewWidget QPrinter = PyQt6.QtPrintSupport.QPrinter -QPrinterInfo = PyQt6.QtPrintSupport.QPrinterInfo \ No newline at end of file +QPrinterInfo = PyQt6.QtPrintSupport.QPrinterInfo +import PyQt6.QtOpenGL +QAbstractOpenGLFunctions = PyQt6.QtOpenGL.QAbstractOpenGLFunctions +QOpenGLBuffer = PyQt6.QtOpenGL.QOpenGLBuffer +QOpenGLDebugLogger = PyQt6.QtOpenGL.QOpenGLDebugLogger +QOpenGLDebugMessage = PyQt6.QtOpenGL.QOpenGLDebugMessage +QOpenGLFramebufferObject = PyQt6.QtOpenGL.QOpenGLFramebufferObject +QOpenGLFramebufferObjectFormat = PyQt6.QtOpenGL.QOpenGLFramebufferObjectFormat +QOpenGLFunctions_2_0 = PyQt6.QtOpenGL.QOpenGLFunctions_2_0 +QOpenGLFunctions_2_1 = PyQt6.QtOpenGL.QOpenGLFunctions_2_1 +QOpenGLFunctions_4_1_Core = PyQt6.QtOpenGL.QOpenGLFunctions_4_1_Core +QOpenGLPaintDevice = PyQt6.QtOpenGL.QOpenGLPaintDevice +QOpenGLPixelTransferOptions = PyQt6.QtOpenGL.QOpenGLPixelTransferOptions +QOpenGLShader = PyQt6.QtOpenGL.QOpenGLShader +QOpenGLShaderProgram = PyQt6.QtOpenGL.QOpenGLShaderProgram +QOpenGLTexture = PyQt6.QtOpenGL.QOpenGLTexture +QOpenGLTextureBlitter = PyQt6.QtOpenGL.QOpenGLTextureBlitter +QOpenGLTimeMonitor = PyQt6.QtOpenGL.QOpenGLTimeMonitor +QOpenGLTimerQuery = PyQt6.QtOpenGL.QOpenGLTimerQuery +QOpenGLVersionFunctionsFactory = PyQt6.QtOpenGL.QOpenGLVersionFunctionsFactory +QOpenGLVersionProfile = PyQt6.QtOpenGL.QOpenGLVersionProfile +QOpenGLVertexArrayObject = PyQt6.QtOpenGL.QOpenGLVertexArrayObject +QOpenGLWindow = PyQt6.QtOpenGL.QOpenGLWindow +import PyQt6.QtOpenGLWidgets +QOpenGLWidget = PyQt6.QtOpenGLWidgets.QOpenGLWidget \ No newline at end of file diff --git a/src/qt/core_name_map.py b/src/qt/core_name_map.py index e67d941c75..5acd8d8ff5 100644 --- a/src/qt/core_name_map.py +++ b/src/qt/core_name_map.py @@ -12,6 +12,7 @@ name_map = {'PYQT_VERSION': 'PyQt6.QtCore', 'QAbstractListModel': 'PyQt6.QtCore', 'QAbstractNativeEventFilter': 'PyQt6.QtCore', 'QAbstractNetworkCache': 'PyQt6.QtNetwork', + 'QAbstractOpenGLFunctions': 'PyQt6.QtOpenGL', 'QAbstractPrintDialog': 'PyQt6.QtPrintSupport', 'QAbstractProxyModel': 'PyQt6.QtCore', 'QAbstractScrollArea': 'PyQt6.QtWidgets', @@ -288,9 +289,31 @@ name_map = {'PYQT_VERSION': 'PyQt6.QtCore', 'QOcspResponse': 'PyQt6.QtNetwork', 'QOcspRevocationReason': 'PyQt6.QtNetwork', 'QOffscreenSurface': 'PyQt6.QtGui', + 'QOpenGLBuffer': 'PyQt6.QtOpenGL', 'QOpenGLContext': 'PyQt6.QtGui', 'QOpenGLContextGroup': 'PyQt6.QtGui', + 'QOpenGLDebugLogger': 'PyQt6.QtOpenGL', + 'QOpenGLDebugMessage': 'PyQt6.QtOpenGL', + 'QOpenGLFramebufferObject': 'PyQt6.QtOpenGL', + 'QOpenGLFramebufferObjectFormat': 'PyQt6.QtOpenGL', + 'QOpenGLFunctions_2_0': 'PyQt6.QtOpenGL', + 'QOpenGLFunctions_2_1': 'PyQt6.QtOpenGL', + 'QOpenGLFunctions_4_1_Core': 'PyQt6.QtOpenGL', + 'QOpenGLPaintDevice': 'PyQt6.QtOpenGL', + 'QOpenGLPixelTransferOptions': 'PyQt6.QtOpenGL', + 'QOpenGLShader': 'PyQt6.QtOpenGL', + 'QOpenGLShaderProgram': 'PyQt6.QtOpenGL', + 'QOpenGLTexture': 'PyQt6.QtOpenGL', + 'QOpenGLTextureBlitter': 'PyQt6.QtOpenGL', + 'QOpenGLTimeMonitor': 'PyQt6.QtOpenGL', + 'QOpenGLTimerQuery': 'PyQt6.QtOpenGL', + 'QOpenGLVersionFunctionsFactory': 'PyQt6.QtOpenGL', + 'QOpenGLVersionProfile': 'PyQt6.QtOpenGL', + 'QOpenGLVertexArrayObject': 'PyQt6.QtOpenGL', + 'QOpenGLWidget': 'PyQt6.QtOpenGLWidgets', + 'QOpenGLWindow': 'PyQt6.QtOpenGL', 'QOperatingSystemVersion': 'PyQt6.QtCore', + 'QOperatingSystemVersionBase': 'PyQt6.QtCore', 'QPageLayout': 'PyQt6.QtGui', 'QPageRanges': 'PyQt6.QtGui', 'QPageSetupDialog': 'PyQt6.QtPrintSupport', @@ -576,6 +599,8 @@ name_map = {'PYQT_VERSION': 'PyQt6.QtCore', 'QtGui': 'PyQt6.QtGui', 'QtMsgType': 'PyQt6.QtCore', 'QtNetwork': 'PyQt6.QtNetwork', + 'QtOpenGL': 'PyQt6.QtOpenGL', + 'QtOpenGLWidgets': 'PyQt6.QtOpenGLWidgets', 'QtPrintSupport': 'PyQt6.QtPrintSupport', 'QtSvg': 'PyQt6.QtSvg', 'QtWidgets': 'PyQt6.QtWidgets', @@ -631,6 +656,7 @@ name_map = {'PYQT_VERSION': 'PyQt6.QtCore', 'qPremultiply': 'PyQt6.QtGui', 'qQNaN': 'PyQt6.QtCore', 'qRed': 'PyQt6.QtGui', + 'qRegisterResourceData': 'PyQt6.QtCore', 'qRemovePostRoutine': 'PyQt6.QtCore', 'qRgb': 'PyQt6.QtGui', 'qRgba': 'PyQt6.QtGui', @@ -644,9 +670,18 @@ name_map = {'PYQT_VERSION': 'PyQt6.QtCore', 'qSetRealNumberPrecision': 'PyQt6.QtCore', 'qUncompress': 'PyQt6.QtCore', 'qUnpremultiply': 'PyQt6.QtGui', + 'qUnregisterResourceData': 'PyQt6.QtCore', 'qVersion': 'PyQt6.QtCore', 'qWarning': 'PyQt6.QtCore', 'qt_set_sequence_auto_mnemonic': 'PyQt6.QtGui', 'sip': 'PyQt6.sip'} -module_names = frozenset(('QtCore', 'QtGui', 'QtWidgets', 'QtNetwork', 'QtSvg', 'QtPrintSupport', 'sip') +module_names = frozenset(('QtCore', + 'QtGui', + 'QtWidgets', + 'QtNetwork', + 'QtSvg', + 'QtPrintSupport', + 'QtOpenGL', + 'QtOpenGLWidgets', + 'sip') ) diff --git a/src/qt/webengine.pyi b/src/qt/webengine.pyi index d7f36835e8..0a5067b82c 100644 --- a/src/qt/webengine.pyi +++ b/src/qt/webengine.pyi @@ -30,5 +30,8 @@ QWebEngineUrlRequestInterceptor = PyQt6.QtWebEngineCore.QWebEngineUrlRequestInte QWebEngineUrlRequestJob = PyQt6.QtWebEngineCore.QWebEngineUrlRequestJob QWebEngineUrlScheme = PyQt6.QtWebEngineCore.QWebEngineUrlScheme QWebEngineUrlSchemeHandler = PyQt6.QtWebEngineCore.QWebEngineUrlSchemeHandler +qWebEngineChromiumSecurityPatchVersion = PyQt6.QtWebEngineCore.qWebEngineChromiumSecurityPatchVersion +qWebEngineChromiumVersion = PyQt6.QtWebEngineCore.qWebEngineChromiumVersion +qWebEngineVersion = PyQt6.QtWebEngineCore.qWebEngineVersion import PyQt6.QtWebEngineWidgets QWebEngineView = PyQt6.QtWebEngineWidgets.QWebEngineView \ No newline at end of file diff --git a/src/qt/webengine_name_map.py b/src/qt/webengine_name_map.py index 434cebbaea..f8b7560a5a 100644 --- a/src/qt/webengine_name_map.py +++ b/src/qt/webengine_name_map.py @@ -31,6 +31,9 @@ name_map = {'PYQT_WEBENGINE_VERSION': 'PyQt6.QtWebEngineCore', 'QWebEngineUrlSchemeHandler': 'PyQt6.QtWebEngineCore', 'QWebEngineView': 'PyQt6.QtWebEngineWidgets', 'QtWebEngineCore': 'PyQt6.QtWebEngineCore', - 'QtWebEngineWidgets': 'PyQt6.QtWebEngineWidgets'} + 'QtWebEngineWidgets': 'PyQt6.QtWebEngineWidgets', + 'qWebEngineChromiumSecurityPatchVersion': 'PyQt6.QtWebEngineCore', + 'qWebEngineChromiumVersion': 'PyQt6.QtWebEngineCore', + 'qWebEngineVersion': 'PyQt6.QtWebEngineCore'} module_names = frozenset(('QtWebEngineCore', 'QtWebEngineWidgets') )