aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qqmlmetaobject
diff options
context:
space:
mode:
authorCaroline Chao <caroline.chao@digia.com>2013-09-04 15:13:53 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-10 07:18:09 +0200
commit7eda052f257740d5fa798aee90d76196feba4efd (patch)
treeab2f4bd389436bfc0d6c3722468a9c8d65e5fd8b /tests/auto/qml/qqmlmetaobject
parent48ba62234c48cbb724784363d65a510c206e31bd (diff)
Change access mode for functions declared in qml
Give the method a QMetaMethod::Public access instead of a QMetaMethod::Protected one. This is valid and is also needed when using the qmlplugindump tool with composite types. Change-Id: Ie1660716d8767cdc949f04a2f324799f2d2fe6c5 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'tests/auto/qml/qqmlmetaobject')
-rw-r--r--tests/auto/qml/qqmlmetaobject/tst_qqmlmetaobject.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/auto/qml/qqmlmetaobject/tst_qqmlmetaobject.cpp b/tests/auto/qml/qqmlmetaobject/tst_qqmlmetaobject.cpp
index 061f2c0b1b..b1f83fcd6c 100644
--- a/tests/auto/qml/qqmlmetaobject/tst_qqmlmetaobject.cpp
+++ b/tests/auto/qml/qqmlmetaobject/tst_qqmlmetaobject.cpp
@@ -379,10 +379,7 @@ 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)
- QCOMPARE(method.access(), QMetaMethod::Protected);
- else
- QCOMPARE(method.access(), QMetaMethod::Public);
+ QCOMPARE(method.access(), QMetaMethod::Public);
QString computedName = signature.left(signature.indexOf('('));
QCOMPARE(QString::fromUtf8(method.name()), computedName);