@@ -416,8 +416,8 @@ void PythonQtTestSignalHandler::testSignalHandler()
416
416
QVERIFY (_helper->emitVariantSignal (12 ));
417
417
_helper->setExpectedVariant (QStringList () << " test1" << " test2" );
418
418
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)));
421
421
422
422
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 " );
423
423
// intentionally not normalized signal:
@@ -527,7 +527,7 @@ void PythonQtTestApi::testCall()
527
527
QVERIFY (_helper->call (" testCall1" , QVariantList () << QVariant (" test" ), QVariant (QString (" test2" ))));
528
528
529
529
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));
531
531
QObject* p = qvariant_cast<QObject*>(r);
532
532
QVERIFY (p==_helper);
533
533
}
@@ -552,7 +552,7 @@ void PythonQtTestApi::testVariables()
552
552
#endif
553
553
QVERIFY (v3 == someValue);
554
554
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);
556
556
QSet<QString> s;
557
557
// check that at least these three variables are set
558
558
s << " obj" << " someObject" << " someValue" ;
0 commit comments