Skip to content

Commit 96010a7

Browse files
usiemsjcfr
authored andcommitted
[Backport] Make PythonQtTests compile with Qt6
(cherry picked from commit MeVisLab/pythonqt@652a1fa)
1 parent f1bac54 commit 96010a7

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

tests/PythonQtTests.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -416,8 +416,8 @@ void PythonQtTestSignalHandler::testSignalHandler()
416416
QVERIFY(_helper->emitVariantSignal(12));
417417
_helper->setExpectedVariant(QStringList() << "test1" << "test2");
418418
QVERIFY(_helper->emitVariantSignal(QStringList() << "test1" << "test2"));
419-
_helper->setExpectedVariant(qVariantFromValue((QObject*)_helper));
420-
QVERIFY(_helper->emitVariantSignal(qVariantFromValue((QObject*)_helper)));
419+
_helper->setExpectedVariant(QVariant::fromValue((QObject*)_helper));
420+
QVERIFY(_helper->emitVariantSignal(QVariant::fromValue((QObject*)_helper)));
421421

422422
PyRun_SimpleString("def testComplexSignal(a,b,l,o):\n if a==12 and b==13 and l==('test1','test2') and o == obj: obj.setPassed();\n");
423423
// intentionally not normalized signal:
@@ -527,7 +527,7 @@ void PythonQtTestApi::testCall()
527527
QVERIFY(_helper->call("testCall1", QVariantList() << QVariant("test"), QVariant(QString("test2"))));
528528

529529
PyRun_SimpleString("def testCall2(a, b):\n if a=='test' and b==obj: obj.setPassed();\n return obj;\n");
530-
QVariant r = PythonQt::self()->call(PythonQt::self()->getMainModule(), "testCall2", QVariantList() << QVariant("test") << qVariantFromValue((QObject*)_helper));
530+
QVariant r = PythonQt::self()->call(PythonQt::self()->getMainModule(), "testCall2", QVariantList() << QVariant("test") << QVariant::fromValue((QObject*)_helper));
531531
QObject* p = qvariant_cast<QObject*>(r);
532532
QVERIFY(p==_helper);
533533
}
@@ -552,7 +552,7 @@ void PythonQtTestApi::testVariables()
552552
#endif
553553
QVERIFY(v3 == someValue);
554554

555-
QStringList l = PythonQt::self()->introspection(PythonQt::self()->getMainModule(), QString::null, PythonQt::Variable);
555+
QStringList l = PythonQt::self()->introspection(PythonQt::self()->getMainModule(), QString(), PythonQt::Variable);
556556
QSet<QString> s;
557557
// check that at least these three variables are set
558558
s << "obj" << "someObject" << "someValue";

0 commit comments

Comments
 (0)