Skip to content

Commit 8514f98

Browse files
authored
Merge pull request #64 from altendky/build_5.15.1
Build 5.15.1
2 parents e1cdd42 + 6d64c79 commit 8514f98

File tree

4 files changed

+16
-14
lines changed

4 files changed

+16
-14
lines changed

Dockerfile

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ ARG BUILD_DATE="2020/09/18"
55
ARG SIP_VERSION="5.4.0"
66
# Also the major.minor of PyQt5-sip
77
ARG SIP_ABI_VERSION="12.8"
8-
ARG PYQT_VERSION="5.15.0"
9-
ARG PYQT_3D_VERSION="5.15.0"
10-
ARG PYQT_CHART_VERSION="5.15.0"
11-
ARG PYQT_DATA_VISUALIZATION_VERSION="5.15.0"
12-
ARG PYQT_PURCHASING_VERSION="5.15.0"
13-
ARG PYQT_WEB_ENGINE_VERSION="5.15.0"
8+
ARG PYQT_VERSION="5.15.1"
9+
ARG PYQT_3D_VERSION="5.15.1"
10+
ARG PYQT_CHART_VERSION="5.15.1"
11+
ARG PYQT_DATA_VISUALIZATION_VERSION="5.15.1"
12+
ARG PYQT_PURCHASING_VERSION="5.15.1"
13+
ARG PYQT_WEB_ENGINE_VERSION="5.15.1"
1414

1515
ARG MAKEFLAGS=""
1616

PyQt5-stubs/QtCore.pyi

+6-6
Original file line numberDiff line numberDiff line change
@@ -4577,7 +4577,7 @@ class QJsonDocument(sip.simplewrapper):
45774577
@typing.overload
45784578
def __init__(self) -> None: ...
45794579
@typing.overload
4580-
def __init__(self, object: typing.Dict[str, typing.Union['QJsonValue', 'QJsonValue.Type', typing.Iterable['QJsonValue'], bool, int, float, str]]) -> None: ...
4580+
def __init__(self, object: typing.Dict[str, typing.Union['QJsonValue', 'QJsonValue.Type', typing.Iterable['QJsonValue'], bool, int, float, None, str]]) -> None: ...
45814581
@typing.overload
45824582
def __init__(self, array: typing.Iterable['QJsonValue']) -> None: ...
45834583
@typing.overload
@@ -4590,9 +4590,9 @@ class QJsonDocument(sip.simplewrapper):
45904590
def swap(self, other: 'QJsonDocument') -> None: ...
45914591
def isNull(self) -> bool: ...
45924592
def setArray(self, array: typing.Iterable['QJsonValue']) -> None: ...
4593-
def setObject(self, object: typing.Dict[str, typing.Union['QJsonValue', 'QJsonValue.Type', typing.Iterable['QJsonValue'], bool, int, float, str]]) -> None: ...
4593+
def setObject(self, object: typing.Dict[str, typing.Union['QJsonValue', 'QJsonValue.Type', typing.Iterable['QJsonValue'], bool, int, float, None, str]]) -> None: ...
45944594
def array(self) -> typing.List['QJsonValue']: ...
4595-
def object(self) -> typing.Dict[str, typing.Union['QJsonValue', 'QJsonValue.Type', typing.Iterable['QJsonValue'], bool, int, float, str]]: ...
4595+
def object(self) -> typing.Dict[str, typing.Union['QJsonValue', 'QJsonValue.Type', typing.Iterable['QJsonValue'], bool, int, float, None, str]]: ...
45964596
def isObject(self) -> bool: ...
45974597
def isArray(self) -> bool: ...
45984598
def isEmpty(self) -> bool: ...
@@ -4627,7 +4627,7 @@ class QJsonValue(sip.simplewrapper):
46274627
@typing.overload
46284628
def __init__(self, type: 'QJsonValue.Type' = ...) -> None: ...
46294629
@typing.overload
4630-
def __init__(self, other: typing.Union['QJsonValue', 'QJsonValue.Type', typing.Iterable['QJsonValue'], bool, int, float, str]) -> None: ...
4630+
def __init__(self, other: typing.Union['QJsonValue', 'QJsonValue.Type', typing.Iterable['QJsonValue'], bool, int, float, None, str]) -> None: ...
46314631

46324632
def __hash__(self) -> int: ...
46334633
@typing.overload
@@ -4640,9 +4640,9 @@ class QJsonValue(sip.simplewrapper):
46404640
@typing.overload
46414641
def toString(self, defaultValue: str) -> str: ...
46424642
@typing.overload
4643-
def toObject(self) -> typing.Dict[str, typing.Union['QJsonValue', 'QJsonValue.Type', typing.Iterable['QJsonValue'], bool, int, float, str]]: ...
4643+
def toObject(self) -> typing.Dict[str, typing.Union['QJsonValue', 'QJsonValue.Type', typing.Iterable['QJsonValue'], bool, int, float, None, str]]: ...
46444644
@typing.overload
4645-
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]]: ...
4645+
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]]: ...
46464646
@typing.overload
46474647
def toArray(self) -> typing.List['QJsonValue']: ...
46484648
@typing.overload

PyQt5-stubs/QtQuick.pyi

+2
Original file line numberDiff line numberDiff line change
@@ -1401,6 +1401,8 @@ class QSGRenderNode(QSGNode):
14011401
def scissorRect(self) -> QtCore.QRect: ...
14021402
def projectionMatrix(self) -> QtGui.QMatrix4x4: ...
14031403

1404+
def __init__(self) -> None: ...
1405+
14041406
def inheritedOpacity(self) -> float: ...
14051407
def clipList(self) -> QSGClipNode: ...
14061408
def matrix(self) -> QtGui.QMatrix4x4: ...

PyQt5-stubs/QtWebChannel.pyi

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,5 @@ class QWebChannelAbstractTransport(QtCore.QObject):
5252

5353
def __init__(self, parent: typing.Optional[QtCore.QObject] = ...) -> None: ...
5454

55-
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: ...
56-
def sendMessage(self, message: typing.Dict[str, typing.Union[QtCore.QJsonValue, QtCore.QJsonValue.Type, typing.Iterable[QtCore.QJsonValue], bool, int, float, str]]) -> None: ...
55+
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: ...
56+
def sendMessage(self, message: typing.Dict[str, typing.Union[QtCore.QJsonValue, QtCore.QJsonValue.Type, typing.Iterable[QtCore.QJsonValue], bool, int, float, None, str]]) -> None: ...

0 commit comments

Comments
 (0)