Merge pull request #71 from altendky/merge_upstream_5.15.1

Merge upstream 5.15.1
python-qt-tools · Sep 22, 2020 · a878cb8 · a878cb8
2 parents ee36556 + a50c873
commit a878cb8
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -5,12 +5,12 @@ ARG BUILD_DATE="2020/09/18"
 ARG SIP_VERSION="5.4.0"
 # Also the major.minor of PyQt5-sip
 ARG SIP_ABI_VERSION="12.8"
-ARG PYQT_VERSION="5.15.0"
-ARG PYQT_3D_VERSION="5.15.0"
-ARG PYQT_CHART_VERSION="5.15.0"
-ARG PYQT_DATA_VISUALIZATION_VERSION="5.15.0"
-ARG PYQT_PURCHASING_VERSION="5.15.0"
-ARG PYQT_WEB_ENGINE_VERSION="5.15.0"
+ARG PYQT_VERSION="5.15.1"
+ARG PYQT_3D_VERSION="5.15.1"
+ARG PYQT_CHART_VERSION="5.15.1"
+ARG PYQT_DATA_VISUALIZATION_VERSION="5.15.1"
+ARG PYQT_PURCHASING_VERSION="5.15.1"
+ARG PYQT_WEB_ENGINE_VERSION="5.15.1"
 
 ARG MAKEFLAGS=""
 

diff --git a/PyQt5-stubs/QtCore.pyi b/PyQt5-stubs/QtCore.pyi
@@ -4588,7 +4588,7 @@ class QJsonDocument(sip.simplewrapper):
     @typing.overload
     def __init__(self) -> None: ...
     @typing.overload
-    def __init__(self, object: typing.Dict[str, typing.Union['QJsonValue', 'QJsonValue.Type', typing.Iterable['QJsonValue'], bool, int, float, str]]) -> None: ...
+    def __init__(self, object: typing.Dict[str, typing.Union['QJsonValue', 'QJsonValue.Type', typing.Iterable['QJsonValue'], bool, int, float, None, str]]) -> None: ...
     @typing.overload
     def __init__(self, array: typing.Iterable[typing.Union['QJsonValue', 'QJsonValue.Type', typing.Dict[str, 'QJsonValue'], bool, int, float, str]]) -> None: ...  # Keep primitive types
     @typing.overload
@@ -4601,9 +4601,9 @@ class QJsonDocument(sip.simplewrapper):
     def swap(self, other: 'QJsonDocument') -> None: ...
     def isNull(self) -> bool: ...
     def setArray(self, array: typing.Iterable[typing.Union['QJsonValue', 'QJsonValue.Type', typing.Dict[str, 'QJsonValue'], bool, int, float, str]]) -> None: ...  # Keep primitive types
-    def setObject(self, object: typing.Dict[str, typing.Union['QJsonValue', 'QJsonValue.Type', typing.Iterable['QJsonValue'], bool, int, float, str]]) -> None: ...
+    def setObject(self, object: typing.Dict[str, typing.Union['QJsonValue', 'QJsonValue.Type', typing.Iterable['QJsonValue'], bool, int, float, None, str]]) -> None: ...
     def array(self) -> typing.List['QJsonValue']: ...
-    def object(self) -> typing.Dict[str, typing.Union['QJsonValue', 'QJsonValue.Type', typing.Iterable['QJsonValue'], bool, int, float, str]]: ...
+    def object(self) -> typing.Dict[str, typing.Union['QJsonValue', 'QJsonValue.Type', typing.Iterable['QJsonValue'], bool, int, float, None, str]]: ...
     def isObject(self) -> bool: ...
     def isArray(self) -> bool: ...
     def isEmpty(self) -> bool: ...
@@ -4638,7 +4638,7 @@ class QJsonValue(sip.simplewrapper):
     @typing.overload
     def __init__(self, type: 'QJsonValue.Type' = ...) -> None: ...
     @typing.overload
-    def __init__(self, other: typing.Union['QJsonValue', 'QJsonValue.Type', typing.Iterable['QJsonValue'], bool, int, float, str]) -> None: ...
+    def __init__(self, other: typing.Union['QJsonValue', 'QJsonValue.Type', typing.Iterable['QJsonValue'], bool, int, float, None, str]) -> None: ...
 
     def __hash__(self) -> int: ...
     @typing.overload
@@ -4651,9 +4651,9 @@ class QJsonValue(sip.simplewrapper):
     @typing.overload
     def toString(self, defaultValue: str) -> str: ...
     @typing.overload
-    def toObject(self) -> typing.Dict[str, typing.Union['QJsonValue', 'QJsonValue.Type', typing.Iterable['QJsonValue'], bool, int, float, str]]: ...
+    def toObject(self) -> typing.Dict[str, typing.Union['QJsonValue', 'QJsonValue.Type', typing.Iterable['QJsonValue'], bool, int, float, None, str]]: ...
     @typing.overload
-    def toObject(self, defaultValue: typing.Dict[str, typing.Union['QJsonValue', 'QJsonValue.Type', typing.Iterable['QJsonValue'], bool, int, float, str]]) -> typing.Dict[str, typing.Union['QJsonValue', 'QJsonValue.Type', typing.Iterable['QJsonValue'], bool, int, float, str]]: ...
+    def toObject(self, defaultValue: typing.Dict[str, typing.Union['QJsonValue', 'QJsonValue.Type', typing.Iterable['QJsonValue'], bool, int, float, None, str]]) -> typing.Dict[str, typing.Union['QJsonValue', 'QJsonValue.Type', typing.Iterable['QJsonValue'], bool, int, float, None, str]]: ...
     @typing.overload
     def toArray(self) -> typing.List['QJsonValue']: ...
     @typing.overload

diff --git a/PyQt5-stubs/QtQuick.pyi b/PyQt5-stubs/QtQuick.pyi
@@ -1401,6 +1401,8 @@ class QSGRenderNode(QSGNode):
         def scissorRect(self) -> QtCore.QRect: ...
         def projectionMatrix(self) -> QtGui.QMatrix4x4: ...
 
+    def __init__(self) -> None: ...
+
     def inheritedOpacity(self) -> float: ...
     def clipList(self) -> QSGClipNode: ...
     def matrix(self) -> QtGui.QMatrix4x4: ...

diff --git a/PyQt5-stubs/QtWebChannel.pyi b/PyQt5-stubs/QtWebChannel.pyi
@@ -52,5 +52,5 @@ class QWebChannelAbstractTransport(QtCore.QObject):
 
     def __init__(self, parent: typing.Optional[QtCore.QObject] = ...) -> None: ...
 
-    def messageReceived(self, message: typing.Dict[str, typing.Union[QtCore.QJsonValue, QtCore.QJsonValue.Type, typing.Iterable[QtCore.QJsonValue], bool, int, float, str]], transport: 'QWebChannelAbstractTransport') -> None: ...
-    def sendMessage(self, message: typing.Dict[str, typing.Union[QtCore.QJsonValue, QtCore.QJsonValue.Type, typing.Iterable[QtCore.QJsonValue], bool, int, float, str]]) -> None: ...
+    def messageReceived(self, message: typing.Dict[str, typing.Union[QtCore.QJsonValue, QtCore.QJsonValue.Type, typing.Iterable[QtCore.QJsonValue], bool, int, float, None, str]], transport: 'QWebChannelAbstractTransport') -> None: ...
+    def sendMessage(self, message: typing.Dict[str, typing.Union[QtCore.QJsonValue, QtCore.QJsonValue.Type, typing.Iterable[QtCore.QJsonValue], bool, int, float, None, str]]) -> None: ...