diff options
| author | Caroline Chao <caroline.chao@digia.com> | 2013-09-09 08:51:40 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-09 20:47:14 +0200 |
| commit | 2dcb0adc3a0a9b93b4cd09f26f2d1bac0e8cd110 (patch) | |
| tree | e1f87adee354f88c21a0b800230c5806fcbb9f5d /tests/auto/qml/qqmlmetaobject | |
| parent | 6608bb9ac629343c2398f6c65ccaa5c64d12b4c2 (diff) | |
Tests: Re-enabled tests for access type of QMetaObject::Signal
QMetaMethod::Signal access is now QMetaMethod:Public in qtbase.
Change-Id: If1a3e76889bd25fb20ba6ed1e3b8206053acd8d9
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'tests/auto/qml/qqmlmetaobject')
| -rw-r--r-- | tests/auto/qml/qqmlmetaobject/tst_qqmlmetaobject.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/qml/qqmlmetaobject/tst_qqmlmetaobject.cpp b/tests/auto/qml/qqmlmetaobject/tst_qqmlmetaobject.cpp index cdd65db532..061f2c0b1b 100644 --- a/tests/auto/qml/qqmlmetaobject/tst_qqmlmetaobject.cpp +++ b/tests/auto/qml/qqmlmetaobject/tst_qqmlmetaobject.cpp @@ -246,7 +246,7 @@ void tst_QQmlMetaObject::property() QCOMPARE(signal.methodType(), QMetaMethod::Signal); QCOMPARE(signal.name(), QByteArray("testChanged")); QCOMPARE(signal.methodSignature(), QByteArray("testChanged()")); - //QCOMPARE(signal.access(), QMetaMethod::Protected); Disabled temporarily. Change in qtbase to make the QMetaMethod signals access Public + QCOMPARE(signal.access(), QMetaMethod::Public); QCOMPARE(signal.parameterCount(), 0); QCOMPARE(signal.parameterTypes(), QList<QByteArray>()); QCOMPARE(signal.parameterNames(), QList<QByteArray>()); @@ -379,8 +379,10 @@ void tst_QQmlMetaObject::method() QMetaMethod method = mo->method(mo->methodOffset()); QCOMPARE(method.methodType(), methodType); QCOMPARE(QString::fromUtf8(method.methodSignature().constData()), signature); - if (method.methodType() != QMetaMethod::Signal) // Disabled temporarily - Change in qtbase to make the QMetaMethod signals access Public + if (method.methodType() != QMetaMethod::Signal) QCOMPARE(method.access(), QMetaMethod::Protected); + else + QCOMPARE(method.access(), QMetaMethod::Public); QString computedName = signature.left(signature.indexOf('(')); QCOMPARE(QString::fromUtf8(method.name()), computedName); |