Skip to content

Commit 22aaddd

Browse files
stlehmannstlehmann
authored
Merge pull request #35 from BryceBeagle/upstream
Update upstream to 5.14.2
2 parents f40d8e3 + 6ee9976 commit 22aaddd

13 files changed

+192
-58
lines changed

‎PyQt5-stubs/QtCore.pyi

+59-11
Large diffs are not rendered by default.

‎PyQt5-stubs/QtDBus.pyi

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# The PEP 484 type hints stub file for the QtDBus module.
22
#
3-
# Generated by SIP 4.19.18
3+
# Generated by SIP 5.1.2
44
#
5-
# Copyright (c) 2019 Riverbank Computing Limited <[email protected]>
5+
# Copyright (c) 2020 Riverbank Computing Limited <[email protected]>
66
#
77
# This file is part of PyQt5.
88
#
@@ -144,6 +144,7 @@ class QDBusConnection(sip.simplewrapper):
144144
def __hash__(self) -> int: ...
145145
def __bool__(self) -> int: ...
146146
def __invert__(self) -> 'QDBusConnection.RegisterOptions': ...
147+
def __index__(self) -> int: ...
147148
def __int__(self) -> int: ...
148149

149150
class ConnectionCapabilities(sip.simplewrapper):
@@ -158,6 +159,7 @@ class QDBusConnection(sip.simplewrapper):
158159
def __hash__(self) -> int: ...
159160
def __bool__(self) -> int: ...
160161
def __invert__(self) -> 'QDBusConnection.ConnectionCapabilities': ...
162+
def __index__(self) -> int: ...
161163
def __int__(self) -> int: ...
162164

163165
@typing.overload
@@ -438,6 +440,7 @@ class QDBusServiceWatcher(QtCore.QObject):
438440
def __hash__(self) -> int: ...
439441
def __bool__(self) -> int: ...
440442
def __invert__(self) -> 'QDBusServiceWatcher.WatchMode': ...
443+
def __index__(self) -> int: ...
441444
def __int__(self) -> int: ...
442445

443446
@typing.overload

‎PyQt5-stubs/QtGui.pyi

+38-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# The PEP 484 type hints stub file for the QtGui module.
22
#
3-
# Generated by SIP 4.19.18
3+
# Generated by SIP 5.1.2
44
#
5-
# Copyright (c) 2019 Riverbank Computing Limited <[email protected]>
5+
# Copyright (c) 2020 Riverbank Computing Limited <[email protected]>
66
#
77
# This file is part of PyQt5.
88
#
@@ -219,13 +219,13 @@ class QPixmap(QPaintDevice):
219219
def scaled(self, width: int, height: int, aspectRatioMode: QtCore.Qt.AspectRatioMode = ..., transformMode: QtCore.Qt.TransformationMode = ...) -> 'QPixmap': ...
220220
@typing.overload
221221
def scaled(self, size: QtCore.QSize, aspectRatioMode: QtCore.Qt.AspectRatioMode = ..., transformMode: QtCore.Qt.TransformationMode = ...) -> 'QPixmap': ...
222-
def createMaskFromColor(self, maskColor: typing.Union['QColor', QtCore.Qt.GlobalColor, 'QGradient'], mode: QtCore.Qt.MaskMode = ...) -> 'QBitmap': ...
222+
def createMaskFromColor(self, maskColor: typing.Union['QColor', QtCore.Qt.GlobalColor], mode: QtCore.Qt.MaskMode = ...) -> 'QBitmap': ...
223223
def createHeuristicMask(self, clipTight: bool = ...) -> 'QBitmap': ...
224224
def hasAlphaChannel(self) -> bool: ...
225225
def hasAlpha(self) -> bool: ...
226226
def setMask(self, a0: 'QBitmap') -> None: ...
227227
def mask(self) -> 'QBitmap': ...
228-
def fill(self, color: typing.Union['QColor', QtCore.Qt.GlobalColor, 'QGradient'] = ...) -> None: ...
228+
def fill(self, color: typing.Union['QColor', QtCore.Qt.GlobalColor] = ...) -> None: ...
229229
@staticmethod
230230
def defaultDepth() -> int: ...
231231
def depth(self) -> int: ...
@@ -291,7 +291,7 @@ class QColor(sip.simplewrapper):
291291
@typing.overload
292292
def __init__(self, aname: str) -> None: ...
293293
@typing.overload
294-
def __init__(self, acolor: typing.Union['QColor', QtCore.Qt.GlobalColor, 'QGradient']) -> None: ...
294+
def __init__(self, acolor: typing.Union['QColor', QtCore.Qt.GlobalColor]) -> None: ...
295295

296296
@typing.overload
297297
@staticmethod
@@ -412,9 +412,9 @@ class QBrush(sip.simplewrapper):
412412
@typing.overload
413413
def __init__(self, bs: QtCore.Qt.BrushStyle) -> None: ...
414414
@typing.overload
415-
def __init__(self, color: typing.Union[QColor, QtCore.Qt.GlobalColor, 'QGradient'], style: QtCore.Qt.BrushStyle = ...) -> None: ...
415+
def __init__(self, color: typing.Union[QColor, QtCore.Qt.GlobalColor], style: QtCore.Qt.BrushStyle = ...) -> None: ...
416416
@typing.overload
417-
def __init__(self, color: typing.Union[QColor, QtCore.Qt.GlobalColor, 'QGradient'], pixmap: QPixmap) -> None: ...
417+
def __init__(self, color: typing.Union[QColor, QtCore.Qt.GlobalColor], pixmap: QPixmap) -> None: ...
418418
@typing.overload
419419
def __init__(self, pixmap: QPixmap) -> None: ...
420420
@typing.overload
@@ -605,8 +605,18 @@ class QCursor(sip.simplewrapper):
605605
@typing.overload
606606
@staticmethod
607607
def setPos(p: QtCore.QPoint) -> None: ...
608+
@typing.overload
609+
@staticmethod
610+
def setPos(screen: 'QScreen', x: int, y: int) -> None: ...
611+
@typing.overload
612+
@staticmethod
613+
def setPos(screen: 'QScreen', p: QtCore.QPoint) -> None: ...
614+
@typing.overload
608615
@staticmethod
609616
def pos() -> QtCore.QPoint: ...
617+
@typing.overload
618+
@staticmethod
619+
def pos(screen: 'QScreen') -> QtCore.QPoint: ...
610620
def hotSpot(self) -> QtCore.QPoint: ...
611621
def pixmap(self) -> QPixmap: ...
612622
def mask(self) -> QBitmap: ...
@@ -1109,6 +1119,7 @@ class QTouchEvent(QInputEvent):
11091119
def __hash__(self) -> int: ...
11101120
def __bool__(self) -> int: ...
11111121
def __invert__(self) -> 'QTouchEvent.TouchPoint.InfoFlags': ...
1122+
def __index__(self) -> int: ...
11121123
def __int__(self) -> int: ...
11131124

11141125
def ellipseDiameters(self) -> QtCore.QSizeF: ...
@@ -1803,6 +1814,7 @@ class QGlyphRun(sip.simplewrapper):
18031814
def __hash__(self) -> int: ...
18041815
def __bool__(self) -> int: ...
18051816
def __invert__(self) -> 'QGlyphRun.GlyphRunFlags': ...
1817+
def __index__(self) -> int: ...
18061818
def __int__(self) -> int: ...
18071819

18081820
@typing.overload
@@ -2289,6 +2301,7 @@ class QImageIOHandler(sip.simplewrapper):
22892301
def __hash__(self) -> int: ...
22902302
def __bool__(self) -> int: ...
22912303
def __invert__(self) -> 'QImageIOHandler.Transformations': ...
2304+
def __index__(self) -> int: ...
22922305
def __int__(self) -> int: ...
22932306

22942307
def __init__(self) -> None: ...
@@ -2816,6 +2829,7 @@ class QOpenGLBuffer(sip.simplewrapper):
28162829
def __hash__(self) -> int: ...
28172830
def __bool__(self) -> int: ...
28182831
def __invert__(self) -> 'QOpenGLBuffer.RangeAccessFlags': ...
2832+
def __index__(self) -> int: ...
28192833
def __int__(self) -> int: ...
28202834

28212835
@typing.overload
@@ -2965,6 +2979,7 @@ class QOpenGLDebugMessage(sip.simplewrapper):
29652979
def __hash__(self) -> int: ...
29662980
def __bool__(self) -> int: ...
29672981
def __invert__(self) -> 'QOpenGLDebugMessage.Sources': ...
2982+
def __index__(self) -> int: ...
29682983
def __int__(self) -> int: ...
29692984

29702985
class Types(sip.simplewrapper):
@@ -2979,6 +2994,7 @@ class QOpenGLDebugMessage(sip.simplewrapper):
29792994
def __hash__(self) -> int: ...
29802995
def __bool__(self) -> int: ...
29812996
def __invert__(self) -> 'QOpenGLDebugMessage.Types': ...
2997+
def __index__(self) -> int: ...
29822998
def __int__(self) -> int: ...
29832999

29843000
class Severities(sip.simplewrapper):
@@ -2993,6 +3009,7 @@ class QOpenGLDebugMessage(sip.simplewrapper):
29933009
def __hash__(self) -> int: ...
29943010
def __bool__(self) -> int: ...
29953011
def __invert__(self) -> 'QOpenGLDebugMessage.Severities': ...
3012+
def __index__(self) -> int: ...
29963013
def __int__(self) -> int: ...
29973014

29983015
@typing.overload
@@ -3205,6 +3222,7 @@ class QOpenGLShader(QtCore.QObject):
32053222
def __hash__(self) -> int: ...
32063223
def __bool__(self) -> int: ...
32073224
def __invert__(self) -> 'QOpenGLShader.ShaderType': ...
3225+
def __index__(self) -> int: ...
32083226
def __int__(self) -> int: ...
32093227

32103228
def __init__(self, type: typing.Union['QOpenGLShader.ShaderType', 'QOpenGLShader.ShaderTypeBit'], parent: typing.Optional[QtCore.QObject] = ...) -> None: ...
@@ -3717,6 +3735,7 @@ class QOpenGLTexture(sip.simplewrapper):
37173735
def __hash__(self) -> int: ...
37183736
def __bool__(self) -> int: ...
37193737
def __invert__(self) -> 'QOpenGLTexture.Features': ...
3738+
def __index__(self) -> int: ...
37203739
def __int__(self) -> int: ...
37213740

37223741
@typing.overload
@@ -4644,6 +4663,7 @@ class QPainter(sip.simplewrapper):
46444663
def __hash__(self) -> int: ...
46454664
def __bool__(self) -> int: ...
46464665
def __invert__(self) -> 'QPainter.RenderHints': ...
4666+
def __index__(self) -> int: ...
46474667
def __int__(self) -> int: ...
46484668

46494669
class PixmapFragment(sip.simplewrapper):
@@ -4679,6 +4699,7 @@ class QPainter(sip.simplewrapper):
46794699
def __hash__(self) -> int: ...
46804700
def __bool__(self) -> int: ...
46814701
def __invert__(self) -> 'QPainter.PixmapFragmentHints': ...
4702+
def __index__(self) -> int: ...
46824703
def __int__(self) -> int: ...
46834704

46844705
@typing.overload
@@ -5026,6 +5047,7 @@ class QTextItem(sip.simplewrapper):
50265047
def __hash__(self) -> int: ...
50275048
def __bool__(self) -> int: ...
50285049
def __invert__(self) -> 'QTextItem.RenderFlags': ...
5050+
def __index__(self) -> int: ...
50295051
def __int__(self) -> int: ...
50305052

50315053
@typing.overload
@@ -5121,6 +5143,7 @@ class QPaintEngine(sip.simplewrapper):
51215143
def __hash__(self) -> int: ...
51225144
def __bool__(self) -> int: ...
51235145
def __invert__(self) -> 'QPaintEngine.PaintEngineFeatures': ...
5146+
def __index__(self) -> int: ...
51245147
def __int__(self) -> int: ...
51255148

51265149
class DirtyFlags(sip.simplewrapper):
@@ -5135,6 +5158,7 @@ class QPaintEngine(sip.simplewrapper):
51355158
def __hash__(self) -> int: ...
51365159
def __bool__(self) -> int: ...
51375160
def __invert__(self) -> 'QPaintEngine.DirtyFlags': ...
5161+
def __index__(self) -> int: ...
51385162
def __int__(self) -> int: ...
51395163

51405164
def __init__(self, features: typing.Union['QPaintEngine.PaintEngineFeatures', 'QPaintEngine.PaintEngineFeature'] = ...) -> None: ...
@@ -5989,6 +6013,7 @@ class QRawFont(sip.simplewrapper):
59896013
def __hash__(self) -> int: ...
59906014
def __bool__(self) -> int: ...
59916015
def __invert__(self) -> 'QRawFont.LayoutFlags': ...
6016+
def __index__(self) -> int: ...
59926017
def __int__(self) -> int: ...
59936018

59946019
@typing.overload
@@ -6108,7 +6133,7 @@ class QRgba64(sip.simplewrapper):
61086133
@typing.overload
61096134
def __init__(self, a0: 'QRgba64') -> None: ...
61106135

6111-
def __long__(self) -> int: ...
6136+
def __int__(self) -> int: ...
61126137
def unpremultiplied(self) -> 'QRgba64': ...
61136138
def premultiplied(self) -> 'QRgba64': ...
61146139
def toRgb16(self) -> int: ...
@@ -6501,6 +6526,7 @@ class QSurfaceFormat(sip.simplewrapper):
65016526
def __hash__(self) -> int: ...
65026527
def __bool__(self) -> int: ...
65036528
def __invert__(self) -> 'QSurfaceFormat.FormatOptions': ...
6529+
def __index__(self) -> int: ...
65046530
def __int__(self) -> int: ...
65056531

65066532
@typing.overload
@@ -6758,6 +6784,7 @@ class QTextDocument(QtCore.QObject):
67586784
def __hash__(self) -> int: ...
67596785
def __bool__(self) -> int: ...
67606786
def __invert__(self) -> 'QTextDocument.FindFlags': ...
6787+
def __index__(self) -> int: ...
67616788
def __int__(self) -> int: ...
67626789

67636790
@typing.overload
@@ -7057,6 +7084,7 @@ class QTextFormat(sip.simplewrapper):
70577084
def __hash__(self) -> int: ...
70587085
def __bool__(self) -> int: ...
70597086
def __invert__(self) -> 'QTextFormat.PageBreakFlags': ...
7087+
def __index__(self) -> int: ...
70607088
def __int__(self) -> int: ...
70617089

70627090
@typing.overload
@@ -7712,6 +7740,7 @@ class QTextOption(sip.simplewrapper):
77127740
def __hash__(self) -> int: ...
77137741
def __bool__(self) -> int: ...
77147742
def __invert__(self) -> 'QTextOption.Flags': ...
7743+
def __index__(self) -> int: ...
77157744
def __int__(self) -> int: ...
77167745

77177746
class Tab(sip.simplewrapper):
@@ -7828,6 +7857,7 @@ class QTouchDevice(sip.simplewrapper):
78287857
def __hash__(self) -> int: ...
78297858
def __bool__(self) -> int: ...
78307859
def __invert__(self) -> 'QTouchDevice.Capabilities': ...
7860+
def __index__(self) -> int: ...
78317861
def __int__(self) -> int: ...
78327862

78337863
@typing.overload

‎PyQt5-stubs/QtNetwork.pyi

+13-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# The PEP 484 type hints stub file for the QtNetwork module.
22
#
3-
# Generated by SIP 4.19.18
3+
# Generated by SIP 5.1.2
44
#
5-
# Copyright (c) 2019 Riverbank Computing Limited <[email protected]>
5+
# Copyright (c) 2020 Riverbank Computing Limited <[email protected]>
66
#
77
# This file is part of PyQt5.
88
#
@@ -150,6 +150,7 @@ class QAbstractSocket(QtCore.QIODevice):
150150
def __hash__(self) -> int: ...
151151
def __bool__(self) -> int: ...
152152
def __invert__(self) -> 'QAbstractSocket.BindMode': ...
153+
def __index__(self) -> int: ...
153154
def __int__(self) -> int: ...
154155

155156
class PauseModes(sip.simplewrapper):
@@ -164,6 +165,7 @@ class QAbstractSocket(QtCore.QIODevice):
164165
def __hash__(self) -> int: ...
165166
def __bool__(self) -> int: ...
166167
def __invert__(self) -> 'QAbstractSocket.PauseModes': ...
168+
def __index__(self) -> int: ...
167169
def __int__(self) -> int: ...
168170

169171
def __init__(self, socketType: 'QAbstractSocket.SocketType', parent: QtCore.QObject) -> None: ...
@@ -401,6 +403,7 @@ class QHostAddress(sip.simplewrapper):
401403
def __hash__(self) -> int: ...
402404
def __bool__(self) -> int: ...
403405
def __invert__(self) -> 'QHostAddress.ConversionMode': ...
406+
def __index__(self) -> int: ...
404407
def __int__(self) -> int: ...
405408

406409
@typing.overload
@@ -496,6 +499,7 @@ class QHstsPolicy(sip.simplewrapper):
496499
def __hash__(self) -> int: ...
497500
def __bool__(self) -> int: ...
498501
def __invert__(self) -> 'QHstsPolicy.PolicyFlags': ...
502+
def __index__(self) -> int: ...
499503
def __int__(self) -> int: ...
500504

501505
@typing.overload
@@ -568,6 +572,7 @@ class QLocalServer(QtCore.QObject):
568572
def __hash__(self) -> int: ...
569573
def __bool__(self) -> int: ...
570574
def __invert__(self) -> 'QLocalServer.SocketOptions': ...
575+
def __index__(self) -> int: ...
571576
def __int__(self) -> int: ...
572577

573578
def __init__(self, parent: typing.Optional[QtCore.QObject] = ...) -> None: ...
@@ -751,6 +756,7 @@ class QNetworkConfigurationManager(QtCore.QObject):
751756
def __hash__(self) -> int: ...
752757
def __bool__(self) -> int: ...
753758
def __invert__(self) -> 'QNetworkConfigurationManager.Capabilities': ...
759+
def __index__(self) -> int: ...
754760
def __int__(self) -> int: ...
755761

756762
def __init__(self, parent: typing.Optional[QtCore.QObject] = ...) -> None: ...
@@ -815,6 +821,7 @@ class QNetworkConfiguration(sip.simplewrapper):
815821
def __hash__(self) -> int: ...
816822
def __bool__(self) -> int: ...
817823
def __invert__(self) -> 'QNetworkConfiguration.StateFlags': ...
824+
def __index__(self) -> int: ...
818825
def __int__(self) -> int: ...
819826

820827
@typing.overload
@@ -974,6 +981,7 @@ class QNetworkInterface(sip.simplewrapper):
974981
def __hash__(self) -> int: ...
975982
def __bool__(self) -> int: ...
976983
def __invert__(self) -> 'QNetworkInterface.InterfaceFlags': ...
984+
def __index__(self) -> int: ...
977985
def __int__(self) -> int: ...
978986

979987
@typing.overload
@@ -1034,6 +1042,7 @@ class QNetworkProxy(sip.simplewrapper):
10341042
def __hash__(self) -> int: ...
10351043
def __bool__(self) -> int: ...
10361044
def __invert__(self) -> 'QNetworkProxy.Capabilities': ...
1045+
def __index__(self) -> int: ...
10371046
def __int__(self) -> int: ...
10381047

10391048
@typing.overload
@@ -1345,6 +1354,7 @@ class QNetworkSession(QtCore.QObject):
13451354
def __hash__(self) -> int: ...
13461355
def __bool__(self) -> int: ...
13471356
def __invert__(self) -> 'QNetworkSession.UsagePolicies': ...
1357+
def __index__(self) -> int: ...
13481358
def __int__(self) -> int: ...
13491359

13501360
def __init__(self, connConfig: QNetworkConfiguration, parent: typing.Optional[QtCore.QObject] = ...) -> None: ...
@@ -1438,6 +1448,7 @@ class QSsl(sip.simplewrapper):
14381448
def __hash__(self) -> int: ...
14391449
def __bool__(self) -> int: ...
14401450
def __invert__(self) -> 'QSsl.SslOptions': ...
1451+
def __index__(self) -> int: ...
14411452
def __int__(self) -> int: ...
14421453

14431454

0 commit comments

Comments
 (0)