aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qqmlmetaobject
diff options
context:
space:
mode:
authorCaroline Chao <caroline.chao@digia.com>2013-09-09 08:47:25 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-09 10:51:04 +0200
commit55b2aa218759bebc56f35bfd973fd96028504c79 (patch)
treeeb54ec94f04b2ff4983483f7804835f5d2d252b2 /tests/auto/qml/qqmlmetaobject
parent6214493cd4416439bc52b2dfe00e3b8aa9f5757c (diff)
Tests: Disabled temporarily access type tests of QMetaMethod::Signal
Change in qtbase to make the QMetaMethod signals access Public instead of Protected. Change-Id: I2de17fdc7edb896eb82ae8f467919e4636904cf6 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'tests/auto/qml/qqmlmetaobject')
-rw-r--r--tests/auto/qml/qqmlmetaobject/tst_qqmlmetaobject.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/qml/qqmlmetaobject/tst_qqmlmetaobject.cpp b/tests/auto/qml/qqmlmetaobject/tst_qqmlmetaobject.cpp
index 5d6d0d66de..cdd65db532 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);
+ //QCOMPARE(signal.access(), QMetaMethod::Protected); Disabled temporarily. Change in qtbase to make the QMetaMethod signals access Public
QCOMPARE(signal.parameterCount(), 0);
QCOMPARE(signal.parameterTypes(), QList<QByteArray>());
QCOMPARE(signal.parameterNames(), QList<QByteArray>());
@@ -379,7 +379,8 @@ void tst_QQmlMetaObject::method()
QMetaMethod method = mo->method(mo->methodOffset());
QCOMPARE(method.methodType(), methodType);
QCOMPARE(QString::fromUtf8(method.methodSignature().constData()), signature);
- QCOMPARE(method.access(), QMetaMethod::Protected);
+ if (method.methodType() != QMetaMethod::Signal) // Disabled temporarily - Change in qtbase to make the QMetaMethod signals access Public
+ QCOMPARE(method.access(), QMetaMethod::Protected);
QString computedName = signature.left(signature.indexOf('('));
QCOMPARE(QString::fromUtf8(method.name()), computedName);