diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2018-06-07 11:17:32 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2018-06-07 11:17:37 +0200 |
| commit | 60a3b6a16304af4b1d8896a06b8407fe49f80ed2 (patch) | |
| tree | 6dca986c5e439c7cb39b17643129dadb436d2fea /sources/pyside2/tests/registry | |
| parent | 33943b54e9470dc8830e94270e6521524acb2954 (diff) | |
| parent | 823eea34b77ca16a545a75b55619a5ed4da38c0e (diff) | |
Merge branch '5.9' into 5.11
Change-Id: I2de0fe8456fca242c56ea28520126f9ebbf540d8
Diffstat (limited to 'sources/pyside2/tests/registry')
6 files changed, 6 insertions, 6 deletions
diff --git a/sources/pyside2/tests/registry/exists_darwin_5_6_4_ci.py b/sources/pyside2/tests/registry/exists_darwin_5_6_4_ci.py index d49f08de1..a43dc38af 100644 --- a/sources/pyside2/tests/registry/exists_darwin_5_6_4_ci.py +++ b/sources/pyside2/tests/registry/exists_darwin_5_6_4_ci.py @@ -302,7 +302,7 @@ if "PySide2.QtCore" in sys.modules: "QBuffer.writeData": ('str', 'int'), # class PySide2.QtCore.QByteArray: - "QByteArray.__init__": [(), ('PySide2.QtCore.QByteArray',), ('int', 'PySide2.support.signature.typing.Union[str, int]')], + "QByteArray.__init__": [(), ('PySide2.QtCore.QByteArray',), ('int', 'PySide2.support.signature.typing.Union[str, int]'), ('bytes',), ('bytearray',)], "QByteArray.__copy__": (), "QByteArray.__reduce__": (), "QByteArray.append": [('PySide2.QtCore.QByteArray',), ('PySide2.support.signature.typing.Union[str, int]',)], diff --git a/sources/pyside2/tests/registry/exists_darwin_5_9_4_ci.py b/sources/pyside2/tests/registry/exists_darwin_5_9_4_ci.py index 63a74ff07..45bee7944 100644 --- a/sources/pyside2/tests/registry/exists_darwin_5_9_4_ci.py +++ b/sources/pyside2/tests/registry/exists_darwin_5_9_4_ci.py @@ -308,7 +308,7 @@ if "PySide2.QtCore" in sys.modules: "QBuffer.writeData": ('str', 'int'), # class PySide2.QtCore.QByteArray: - "QByteArray.__init__": [(), ('PySide2.QtCore.QByteArray',), ('int', 'Union[str, int]')], + "QByteArray.__init__": [(), ('PySide2.QtCore.QByteArray',), ('int', 'Union[str, int]'), ('bytes',), ('bytearray',)], "QByteArray.__copy__": (), "QByteArray.__reduce__": (), "QByteArray.append": [('PySide2.QtCore.QByteArray',), ('Union[str, int]',), ('int', 'Union[str, int]')], diff --git a/sources/pyside2/tests/registry/exists_linux_5_6_4_ci.py b/sources/pyside2/tests/registry/exists_linux_5_6_4_ci.py index 7c1188b21..2addd0611 100644 --- a/sources/pyside2/tests/registry/exists_linux_5_6_4_ci.py +++ b/sources/pyside2/tests/registry/exists_linux_5_6_4_ci.py @@ -302,7 +302,7 @@ if "PySide2.QtCore" in sys.modules: "QBuffer.writeData": ('str', 'int'), # class PySide2.QtCore.QByteArray: - "QByteArray.__init__": [(), ('PySide2.QtCore.QByteArray',), ('int', 'PySide2.support.signature.typing.Union[str, int]')], + "QByteArray.__init__": [(), ('PySide2.QtCore.QByteArray',), ('int', 'PySide2.support.signature.typing.Union[str, int]'), ('bytes',), ('bytearray',)], "QByteArray.__copy__": (), "QByteArray.__reduce__": (), "QByteArray.append": [('PySide2.QtCore.QByteArray',), ('PySide2.support.signature.typing.Union[str, int]',)], diff --git a/sources/pyside2/tests/registry/exists_linux_5_9_4_ci.py b/sources/pyside2/tests/registry/exists_linux_5_9_4_ci.py index c552e21f0..636c88a7e 100644 --- a/sources/pyside2/tests/registry/exists_linux_5_9_4_ci.py +++ b/sources/pyside2/tests/registry/exists_linux_5_9_4_ci.py @@ -308,7 +308,7 @@ if "PySide2.QtCore" in sys.modules: "QBuffer.writeData": ('str', 'int'), # class PySide2.QtCore.QByteArray: - "QByteArray.__init__": [(), ('PySide2.QtCore.QByteArray',), ('int', 'Union[str, int]')], + "QByteArray.__init__": [(), ('PySide2.QtCore.QByteArray',), ('int', 'Union[str, int]'), ('bytes',), ('bytearray',)], "QByteArray.__copy__": (), "QByteArray.__reduce__": (), "QByteArray.append": [('PySide2.QtCore.QByteArray',), ('Union[str, int]',), ('int', 'Union[str, int]')], diff --git a/sources/pyside2/tests/registry/exists_win32_5_6_4_ci.py b/sources/pyside2/tests/registry/exists_win32_5_6_4_ci.py index dbf8e59c4..3b4c7441b 100644 --- a/sources/pyside2/tests/registry/exists_win32_5_6_4_ci.py +++ b/sources/pyside2/tests/registry/exists_win32_5_6_4_ci.py @@ -304,7 +304,7 @@ if "PySide2.QtCore" in sys.modules: "QBuffer.writeData": ('str', 'int'), # class PySide2.QtCore.QByteArray: - "QByteArray.__init__": [(), ('PySide2.QtCore.QByteArray',), ('int', 'PySide2.support.signature.typing.Union[str, int]')], + "QByteArray.__init__": [(), ('PySide2.QtCore.QByteArray',), ('int', 'PySide2.support.signature.typing.Union[str, int]'), ('bytes',), ('bytearray',)], "QByteArray.__copy__": (), "QByteArray.__reduce__": (), "QByteArray.append": [('PySide2.QtCore.QByteArray',), ('PySide2.support.signature.typing.Union[str, int]',)], diff --git a/sources/pyside2/tests/registry/exists_win32_5_9_4_ci.py b/sources/pyside2/tests/registry/exists_win32_5_9_4_ci.py index 01e572e21..adf853850 100644 --- a/sources/pyside2/tests/registry/exists_win32_5_9_4_ci.py +++ b/sources/pyside2/tests/registry/exists_win32_5_9_4_ci.py @@ -310,7 +310,7 @@ if "PySide2.QtCore" in sys.modules: "QBuffer.writeData": ('str', 'int'), # class PySide2.QtCore.QByteArray: - "QByteArray.__init__": [(), ('PySide2.QtCore.QByteArray',), ('int', 'Union[str, int]')], + "QByteArray.__init__": [(), ('PySide2.QtCore.QByteArray',), ('int', 'Union[str, int]'), ('bytes',), ('bytearray',)], "QByteArray.__copy__": (), "QByteArray.__reduce__": (), "QByteArray.append": [('PySide2.QtCore.QByteArray',), ('Union[str, int]',), ('int', 'Union[str, int]')], |