diff options
Diffstat (limited to 'tests/auto/qml/qqmlimport/tst_qqmlimport.cpp')
| -rw-r--r-- | tests/auto/qml/qqmlimport/tst_qqmlimport.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp b/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp index 04c6c21bcb..360558a984 100644 --- a/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp +++ b/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp @@ -172,7 +172,7 @@ void tst_QQmlImport::testDesignerSupported() QVERIFY(window->errors().isEmpty()); QString warningString("%1:30:1: module does not support the designer \"MyPluginUnsupported\" \n import MyPluginUnsupported 1.0\r \n ^ "); -#if !defined(Q_OS_WIN) && !defined(Q_OS_ANDROID) +#if !defined(Q_OS_WIN) warningString.remove('\r'); #endif warningString = warningString.arg(testFileUrl("testfile_unsupported.qml").toString()); @@ -409,10 +409,9 @@ void tst_QQmlImport::removeDynamicPlugin() QQmlEngine engine; { // Load something that adds a dynamic plugin - QQmlComponent component(&engine); + QQmlComponent component(&engine, testFileUrl("importQtQuickTooling.qml")); // Make sure to use something other than QtTest here, since the !plugins.isEmpty() // check will fail if we do. - component.setData(QByteArray("import QtQuick.tooling; Property{}"), QUrl()); QVERIFY2(component.isReady(), qPrintable(component.errorString())); } QQmlImportDatabase *imports = &QQmlEnginePrivate::get(&engine)->importDatabase; |