diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-23 14:32:38 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-02 08:48:43 +0000 |
| commit | 82934bc00c2de7ea51fd7e95601472fcdf7b6aea (patch) | |
| tree | cecc2542b0c18c5160cd5fb656f684327336352f /sources/pyside2/tests | |
| parent | 908c89e9c08297ca854e7c2064b93368d215d0b2 (diff) | |
Adapt to recent changes in qtbase
- Remove QProcess::pid(), adapt test
(qtbase/0f8848b7e25e4d8fb9265ff6e0aa31946addd741)
- Remove enum from QPrinter
- Add enum GrabTransition to QPointingDevice
- Remove deprecated functions from QByteArray, QXmlStreamAttributes
- Adapt Qml tests
- Remove fake property from QLayout
Task-number: PYSIDE-1339
Task-number: PYSIDE-904
Change-Id: I98cc90723cbeda15b23c5b22d026cb2ab9a358ff
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside2/tests')
| -rw-r--r-- | sources/pyside2/tests/QtCore/qprocess_test.py | 2 | ||||
| -rw-r--r-- | sources/pyside2/tests/QtQml/qquickview_test.py | 7 | ||||
| -rw-r--r-- | sources/pyside2/tests/pysidetest/qvariant_test.py | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/sources/pyside2/tests/QtCore/qprocess_test.py b/sources/pyside2/tests/QtCore/qprocess_test.py index daaf0843b..1667f37b3 100644 --- a/sources/pyside2/tests/QtCore/qprocess_test.py +++ b/sources/pyside2/tests/QtCore/qprocess_test.py @@ -50,7 +50,7 @@ class TestQProcess (unittest.TestCase): p = QProcess() p.start("dir", []) p.waitForStarted() - pid = p.pid() + pid = p.processId() # We can't test the pid method result because it returns 0 when the # process isn't running if p.state() == QProcess.Running: diff --git a/sources/pyside2/tests/QtQml/qquickview_test.py b/sources/pyside2/tests/QtQml/qquickview_test.py index 0b723612e..9694cf56e 100644 --- a/sources/pyside2/tests/QtQml/qquickview_test.py +++ b/sources/pyside2/tests/QtQml/qquickview_test.py @@ -40,7 +40,7 @@ from helper.helper import adjust_filename from helper.timedqapplication import TimedQApplication from PySide2.QtCore import QUrl, QObject, Property, Slot -from PySide2.QtQml import QtQml +from PySide2.QtQml import QtQml, QQmlEngine from PySide2.QtQuick import QQuickView class MyObject(QObject): @@ -76,8 +76,9 @@ class TestQQuickView(TimedQApplication): self.assertEqual(view.status(), QQuickView.Ready) rootObject = view.rootObject() self.assertTrue(rootObject) - self.assertTrue(QtQml.qmlEngine(rootObject)) - self.assertTrue(QtQml.qmlContext(rootObject)) + context = QQmlEngine.contextForObject(rootObject) + self.assertTrue(context) + self.assertTrue(context.engine()) def testModelExport(self): view = QQuickView() diff --git a/sources/pyside2/tests/pysidetest/qvariant_test.py b/sources/pyside2/tests/pysidetest/qvariant_test.py index 0efece889..547cca441 100644 --- a/sources/pyside2/tests/pysidetest/qvariant_test.py +++ b/sources/pyside2/tests/pysidetest/qvariant_test.py @@ -45,7 +45,7 @@ class QVariantTest(UsesQApplication): def testQKeySequenceQVariantOperator(self): # bug #775 ks = QKeySequence(Qt.SHIFT, Qt.CTRL, Qt.Key_P, Qt.Key_R) - self.assertEqual(TestObject.checkType(ks), 75) + self.assertEqual(TestObject.checkType(ks), 4107) if __name__ == '__main__': unittest.main() |