diff --git a/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp index 5e6b54c6123..28ea814d90d 100644 --- a/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp +++ b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp @@ -796,6 +796,12 @@ void tst_QMetaObject::invokeMetaMember() Q_ARG(QList, argument))); QCOMPARE(returnValue, argument); QCOMPARE(obj.slotResult, QString("sl13")); + // same, testing the QList/QVector aliasing: + QVERIFY(QMetaObject::invokeMethod(&obj, "sl13", + Q_RETURN_ARG(QVector, returnValue), + Q_ARG(QVector, argument))); + QCOMPARE(returnValue, argument); + QCOMPARE(obj.slotResult, QString("sl13")); // return qint64 qint64 return64; @@ -1583,6 +1589,12 @@ void tst_QMetaObject::invokeBlockingQueuedMetaMember() Q_ARG(QList, argument))); QCOMPARE(returnValue, argument); QCOMPARE(obj.slotResult, QString("sl13")); + // same, testing QVector/QList aliasing: + QVERIFY(QMetaObject::invokeMethod(&obj, "sl13", Qt::BlockingQueuedConnection, + Q_RETURN_ARG(QVector, returnValue), + Q_ARG(QVector, argument))); + QCOMPARE(returnValue, argument); + QCOMPARE(obj.slotResult, QString("sl13")); // return qint64 qint64 return64; @@ -2122,7 +2134,7 @@ void tst_QMetaObject::invokeQueuedAutoRegister() &obj, "slotWithRegistrableArgument", Qt::QueuedConnection, Q_ARG(QtTestObject *, shared.data()), Q_ARG(QPointer, shared.data()), Q_ARG(QSharedPointer, shared), Q_ARG(QWeakPointer, shared), - Q_ARG(QList, QList()), + Q_ARG(QVector, QVector()), // check QVector/QList aliasing Q_ARG(QList, QList()))); QVERIFY(obj.slotResult.isEmpty()); qApp->processEvents(QEventLoop::AllEvents); @@ -2345,6 +2357,7 @@ void tst_QMetaObject::customPropertyType() prop = metaObject()->property(metaObject()->indexOfProperty("value4")); QCOMPARE(prop.metaType().id(), QMetaType::QVariantList); QCOMPARE(prop.metaType(), QMetaType::fromType>()); + QCOMPARE(prop.metaType(), QMetaType::fromType>()); prop = metaObject()->property(metaObject()->indexOfProperty("value5")); QCOMPARE(prop.metaType().id(), QMetaType::QVariantList); @@ -2635,10 +2648,10 @@ void tst_QMetaObject::metaMethod() argument << QString("one") << QString("two") << QString("three"); //wrong object //QVERIFY(!sl13.invoke(this, Q_RETURN_ARG(QList, returnValue), Q_ARG(QList, argument))); - QVERIFY(!sl13.invoke(0, Q_RETURN_ARG(QList, returnValue), Q_ARG(QList, argument))); + QVERIFY(!sl13.invoke(0, Q_RETURN_ARG(QVector, returnValue), Q_ARG(QList, argument))); QVERIFY(returnValue.isEmpty()); - QVERIFY(sl13.invoke(&obj, Q_RETURN_ARG(QList, returnValue), Q_ARG(QList, argument))); + QVERIFY(sl13.invoke(&obj, Q_RETURN_ARG(QList, returnValue), Q_ARG(QVector, argument))); QCOMPARE(returnValue, argument); QCOMPARE(obj.slotResult, QString("sl13")); }