Skip to content

Commit ccd2224

Browse files
committed
Merge remote-tracking branch 'remotes/upstream/master'
# Conflicts: # PyQt5-stubs/__init__.pyi
2 parents b90d882 + 0edeb06 commit ccd2224

File tree

4 files changed

+605
-278
lines changed

4 files changed

+605
-278
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: python
2-
python: 3.6
2+
python: 3.7
33

44
install:
55
- pip install tox

PyQt5-stubs/QtCore.pyi

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1839,6 +1839,8 @@ class QModelIndex(sip.simplewrapper):
18391839
def column(self) -> int: ...
18401840
def row(self) -> int: ...
18411841
def child(self, arow: int, acolumn: int) -> 'QModelIndex': ...
1842+
def siblingAtColumn(self, column: int) -> 'QModelIndex': ...
1843+
def siblingAtRow(self, row: int) -> 'QModelIndex': ...
18421844

18431845

18441846
class QPersistentModelIndex(sip.simplewrapper):
@@ -6033,6 +6035,10 @@ class QPoint(sip.simplewrapper):
60336035

60346036
def __neg__(self) -> 'QPoint': ...
60356037
def __pos__(self) -> 'QPoint': ...
6038+
def __add__(self, point: 'QPoint') -> 'QPoint': ...
6039+
def __sub__(self, point: 'QPoint') -> 'QPoint': ...
6040+
def __mul__(self, factor: float) -> 'QPoint': ...
6041+
def __truediv__(self, divisor: float) -> 'QPoint': ...
60366042
@staticmethod
60376043
def dotProduct(p1: 'QPoint', p2: 'QPoint') -> int: ...
60386044
def setY(self, ypos: int) -> None: ...
@@ -6058,6 +6064,10 @@ class QPointF(sip.simplewrapper):
60586064

60596065
def __neg__(self) -> 'QPointF': ...
60606066
def __pos__(self) -> 'QPointF': ...
6067+
def __add__(self, point: 'QPointF') -> 'QPointF': ...
6068+
def __sub__(self, point: 'QPointF') -> 'QPointF': ...
6069+
def __mul__(self, factor: float) -> 'QPointF': ...
6070+
def __truediv__(self, divisor: float) -> 'QPointF': ...
60616071
@staticmethod
60626072
def dotProduct(p1: typing.Union['QPointF', QPoint], p2: typing.Union['QPointF', QPoint]) -> float: ...
60636073
def manhattanLength(self) -> float: ...

0 commit comments

Comments
 (0)