on xenial help sign in
strip known namespaces from the class names
commitb7debc78cbbce839ad08bbda90f6bd06e3b50b64 authorZsombor Egri <zsombor.egri@canonical.com> dateFri 15 Jul 2016, 14:21 (10 years ago) parentfa2329b
1 file changed+11−1
tests/utils/modules/Unity/Test/testutil.cpp+11−1
tests/utils/modules/Unity/Test/testutil.cpp+11−1
@@ -51,8 +51,18 @@ TestUtil::isInstanceOf(QObject *obj, QString name)
5151 const QMetaObject *metaObject = obj->metaObject();
5252 while (!result && metaObject) {
5353 const QString className = metaObject->className();
54− const QString qmlName = className.left(className.indexOf("_QMLTYPE_"));
54+ QString qmlName = className.left(className.indexOf("_QMLTYPE_"));
5555 result = qmlName == name;
56+ // test for known namespaces
57+ if (!result) {
58+ // remove UbuntuGestures and UbuntuToolkit namespace
59+ qmlName = qmlName.remove(QString("UbuntuGestures::"));
60+ result = qmlName == name;
61+ }
62+ if (!result) {
63+ qmlName = qmlName.remove(QString("UbuntuToolkit::"));
64+ result = qmlName == name;
65+ }
5666 metaObject = metaObject->superClass();
5767 }
5868 }