From 3992bfea550f2caae9750e3fb8d456335248dc87 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 20 Feb 2019 15:06:43 +0100 Subject: QQmlExtensionPlugin test: Don't fail when detecting old plugin Some Qt modules still register plugins under the old IID. This makes the test fail if any of those have been compiled before. As the old IID is still recognized we don't really have to fail in this case. A warning should be enough. Change-Id: I409534d51c339ce361002866a50c47c721170b8b Reviewed-by: Simon Hausmann --- tests/auto/qml/qqmlextensionplugin/tst_qqmlextensionplugin.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/auto/qml/qqmlextensionplugin/tst_qqmlextensionplugin.cpp b/tests/auto/qml/qqmlextensionplugin/tst_qqmlextensionplugin.cpp index 2511eebefe..341a49bf09 100644 --- a/tests/auto/qml/qqmlextensionplugin/tst_qqmlextensionplugin.cpp +++ b/tests/auto/qml/qqmlextensionplugin/tst_qqmlextensionplugin.cpp @@ -109,7 +109,10 @@ void tst_qqmlextensionplugin::iidCheck() if (qobject_cast(loader.instance())) { QString iid = loader.metaData().value(QStringLiteral("IID")).toString(); - QCOMPARE(iid, QLatin1String(QQmlExtensionInterface_iid)); + if (iid == QLatin1String(QQmlExtensionInterface_iid_old)) + qWarning() << "Old extension plugin found. Update the IID" << loader.metaData(); + else + QCOMPARE(iid, QLatin1String(QQmlExtensionInterface_iid)); } } -- cgit v1.2.3