From 8be484c108f74c8d84558dd1529d81c17399eb52 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 10 Aug 2022 22:02:39 +0530 Subject: [PATCH] Allow importing QtQuick from qt.core --- src/qt/__init__.py | 2 +- src/qt/__main__.py | 1 + src/qt/core.pyi | 43 ++++++++++++++++++++++++++++++++++++++++- src/qt/core_name_map.py | 42 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 86 insertions(+), 2 deletions(-) diff --git a/src/qt/__init__.py b/src/qt/__init__.py index f85c2c3ada..e552b5be47 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', 'QtOpenGL', 'QtOpenGLWidgets', 'QtWebEngineCore', 'QtWebEngineWidgets', 'QtDBus') +top_level_module_names=('QtCore', 'QtGui', 'QtWidgets', 'QtNetwork', 'QtSvg', 'QtPrintSupport', 'QtOpenGL', 'QtOpenGLWidgets', 'QtQuick', 'QtWebEngineCore', 'QtWebEngineWidgets', 'QtDBus') def __getattr__(name): diff --git a/src/qt/__main__.py b/src/qt/__main__.py index 78bea62583..b857cf2907 100644 --- a/src/qt/__main__.py +++ b/src/qt/__main__.py @@ -19,6 +19,7 @@ module_lists = { 'QtPrintSupport', 'QtOpenGL', 'QtOpenGLWidgets', + 'QtQuick', ), 'webengine': ( 'QtWebEngineCore', diff --git a/src/qt/core.pyi b/src/qt/core.pyi index d1f4e1a458..c2682e08f8 100644 --- a/src/qt/core.pyi +++ b/src/qt/core.pyi @@ -673,4 +673,45 @@ 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 +QOpenGLWidget = PyQt6.QtOpenGLWidgets.QOpenGLWidget +import PyQt6.QtQuick +QNativeInterface = PyQt6.QtQuick.QNativeInterface +QQuickAsyncImageProvider = PyQt6.QtQuick.QQuickAsyncImageProvider +QQuickCloseEvent = PyQt6.QtQuick.QQuickCloseEvent +QQuickFramebufferObject = PyQt6.QtQuick.QQuickFramebufferObject +QQuickGraphicsConfiguration = PyQt6.QtQuick.QQuickGraphicsConfiguration +QQuickGraphicsDevice = PyQt6.QtQuick.QQuickGraphicsDevice +QQuickImageProvider = PyQt6.QtQuick.QQuickImageProvider +QQuickImageResponse = PyQt6.QtQuick.QQuickImageResponse +QQuickItem = PyQt6.QtQuick.QQuickItem +QQuickItemGrabResult = PyQt6.QtQuick.QQuickItemGrabResult +QQuickPaintedItem = PyQt6.QtQuick.QQuickPaintedItem +QQuickRenderControl = PyQt6.QtQuick.QQuickRenderControl +QQuickRenderTarget = PyQt6.QtQuick.QQuickRenderTarget +QQuickTextDocument = PyQt6.QtQuick.QQuickTextDocument +QQuickTextureFactory = PyQt6.QtQuick.QQuickTextureFactory +QQuickView = PyQt6.QtQuick.QQuickView +QQuickWindow = PyQt6.QtQuick.QQuickWindow +QSGBasicGeometryNode = PyQt6.QtQuick.QSGBasicGeometryNode +QSGClipNode = PyQt6.QtQuick.QSGClipNode +QSGDynamicTexture = PyQt6.QtQuick.QSGDynamicTexture +QSGFlatColorMaterial = PyQt6.QtQuick.QSGFlatColorMaterial +QSGGeometry = PyQt6.QtQuick.QSGGeometry +QSGGeometryNode = PyQt6.QtQuick.QSGGeometryNode +QSGImageNode = PyQt6.QtQuick.QSGImageNode +QSGMaterial = PyQt6.QtQuick.QSGMaterial +QSGMaterialShader = PyQt6.QtQuick.QSGMaterialShader +QSGMaterialType = PyQt6.QtQuick.QSGMaterialType +QSGNode = PyQt6.QtQuick.QSGNode +QSGOpacityNode = PyQt6.QtQuick.QSGOpacityNode +QSGOpaqueTextureMaterial = PyQt6.QtQuick.QSGOpaqueTextureMaterial +QSGRectangleNode = PyQt6.QtQuick.QSGRectangleNode +QSGRenderNode = PyQt6.QtQuick.QSGRenderNode +QSGRendererInterface = PyQt6.QtQuick.QSGRendererInterface +QSGSimpleRectNode = PyQt6.QtQuick.QSGSimpleRectNode +QSGSimpleTextureNode = PyQt6.QtQuick.QSGSimpleTextureNode +QSGTexture = PyQt6.QtQuick.QSGTexture +QSGTextureMaterial = PyQt6.QtQuick.QSGTextureMaterial +QSGTextureProvider = PyQt6.QtQuick.QSGTextureProvider +QSGTransformNode = PyQt6.QtQuick.QSGTransformNode +QSGVertexColorMaterial = PyQt6.QtQuick.QSGVertexColorMaterial \ No newline at end of file diff --git a/src/qt/core_name_map.py b/src/qt/core_name_map.py index 5acd8d8ff5..1a90852010 100644 --- a/src/qt/core_name_map.py +++ b/src/qt/core_name_map.py @@ -269,6 +269,7 @@ name_map = {'PYQT_VERSION': 'PyQt6.QtCore', 'QMutex': 'PyQt6.QtCore', 'QMutexLocker': 'PyQt6.QtCore', 'QNativeGestureEvent': 'PyQt6.QtGui', + 'QNativeInterface': 'PyQt6.QtQuick', 'QNetworkAccessManager': 'PyQt6.QtNetwork', 'QNetworkAddressEntry': 'PyQt6.QtNetwork', 'QNetworkCacheMetaData': 'PyQt6.QtNetwork', @@ -365,6 +366,22 @@ name_map = {'PYQT_VERSION': 'PyQt6.QtCore', 'QProxyStyle': 'PyQt6.QtWidgets', 'QPushButton': 'PyQt6.QtWidgets', 'QQuaternion': 'PyQt6.QtGui', + 'QQuickAsyncImageProvider': 'PyQt6.QtQuick', + 'QQuickCloseEvent': 'PyQt6.QtQuick', + 'QQuickFramebufferObject': 'PyQt6.QtQuick', + 'QQuickGraphicsConfiguration': 'PyQt6.QtQuick', + 'QQuickGraphicsDevice': 'PyQt6.QtQuick', + 'QQuickImageProvider': 'PyQt6.QtQuick', + 'QQuickImageResponse': 'PyQt6.QtQuick', + 'QQuickItem': 'PyQt6.QtQuick', + 'QQuickItemGrabResult': 'PyQt6.QtQuick', + 'QQuickPaintedItem': 'PyQt6.QtQuick', + 'QQuickRenderControl': 'PyQt6.QtQuick', + 'QQuickRenderTarget': 'PyQt6.QtQuick', + 'QQuickTextDocument': 'PyQt6.QtQuick', + 'QQuickTextureFactory': 'PyQt6.QtQuick', + 'QQuickView': 'PyQt6.QtQuick', + 'QQuickWindow': 'PyQt6.QtQuick', 'QRadialGradient': 'PyQt6.QtGui', 'QRadioButton': 'PyQt6.QtWidgets', 'QRandomGenerator': 'PyQt6.QtCore', @@ -385,6 +402,29 @@ name_map = {'PYQT_VERSION': 'PyQt6.QtCore', 'QRgba64': 'PyQt6.QtGui', 'QRubberBand': 'PyQt6.QtWidgets', 'QRunnable': 'PyQt6.QtCore', + 'QSGBasicGeometryNode': 'PyQt6.QtQuick', + 'QSGClipNode': 'PyQt6.QtQuick', + 'QSGDynamicTexture': 'PyQt6.QtQuick', + 'QSGFlatColorMaterial': 'PyQt6.QtQuick', + 'QSGGeometry': 'PyQt6.QtQuick', + 'QSGGeometryNode': 'PyQt6.QtQuick', + 'QSGImageNode': 'PyQt6.QtQuick', + 'QSGMaterial': 'PyQt6.QtQuick', + 'QSGMaterialShader': 'PyQt6.QtQuick', + 'QSGMaterialType': 'PyQt6.QtQuick', + 'QSGNode': 'PyQt6.QtQuick', + 'QSGOpacityNode': 'PyQt6.QtQuick', + 'QSGOpaqueTextureMaterial': 'PyQt6.QtQuick', + 'QSGRectangleNode': 'PyQt6.QtQuick', + 'QSGRenderNode': 'PyQt6.QtQuick', + 'QSGRendererInterface': 'PyQt6.QtQuick', + 'QSGSimpleRectNode': 'PyQt6.QtQuick', + 'QSGSimpleTextureNode': 'PyQt6.QtQuick', + 'QSGTexture': 'PyQt6.QtQuick', + 'QSGTextureMaterial': 'PyQt6.QtQuick', + 'QSGTextureProvider': 'PyQt6.QtQuick', + 'QSGTransformNode': 'PyQt6.QtQuick', + 'QSGVertexColorMaterial': 'PyQt6.QtQuick', 'QSaveFile': 'PyQt6.QtCore', 'QScreen': 'PyQt6.QtGui', 'QScrollArea': 'PyQt6.QtWidgets', @@ -602,6 +642,7 @@ name_map = {'PYQT_VERSION': 'PyQt6.QtCore', 'QtOpenGL': 'PyQt6.QtOpenGL', 'QtOpenGLWidgets': 'PyQt6.QtOpenGLWidgets', 'QtPrintSupport': 'PyQt6.QtPrintSupport', + 'QtQuick': 'PyQt6.QtQuick', 'QtSvg': 'PyQt6.QtSvg', 'QtWidgets': 'PyQt6.QtWidgets', 'pyqtBoundSignal': 'PyQt6.QtCore', @@ -683,5 +724,6 @@ module_names = frozenset(('QtCore', 'QtPrintSupport', 'QtOpenGL', 'QtOpenGLWidgets', + 'QtQuick', 'sip') )