Skip to content

Merge upstream 5.15.1 #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 22, 2020
Merged

Merge upstream 5.15.1 #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e17f9ef
5.15.1
altendky Sep 14, 2020
a677b5b
Merge branch 'build_5.15.0' into build_5.15.1
altendky Sep 18, 2020
6d64c79
Merge branch 'upstream' into build_5.15.1
altendky Sep 21, 2020
8514f98
Merge pull request #64 from altendky/build_5.15.1
altendky Sep 22, 2020
a43634f
Merge commit '8514f983974548a475fbb9918b2242b7efddee3a' into merge_up…
altendky Sep 22, 2020
a50c873
Merge branch 'master' into merge_upstream_5.15.1
altendky Sep 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=""

Expand Down
12 changes: 6 additions & 6 deletions PyQt5-stubs/QtCore.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: ...
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions PyQt5-stubs/QtQuick.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: ...
Expand Down
4 changes: 2 additions & 2 deletions PyQt5-stubs/QtWebChannel.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: ...