Merge remote-tracking branch 'origin/dev' into wip/cmake

Change-Id: I0c5b939c70bdb91ccdf7068784308416dcaa5736

1 files changed, 17 insertions, 0 deletions

diff --git a/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp b/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp
index ae99e35467..dccd3951b3 100644
--- a/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp
+++ b/tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp
@@ -76,6 +76,7 @@ private slots:
     void sortCaseSensitive_data();
     void sortCaseSensitive();
     void updateProperties();
+    void importBothVersions();
 private:
     void checkNoErrors(const QQmlComponent& component);
     QQmlEngine engine;
@@ -467,6 +468,22 @@ void tst_qquickfolderlistmodel::updateProperties()
     QCOMPARE(showHidden.toBool(), true);
 }
 
+void tst_qquickfolderlistmodel::importBothVersions()
+{
+    {
+        QQmlComponent component(&engine, testFileUrl("sortReversed.qml"));
+        checkNoErrors(component);
+        QScopedPointer<QObject> obj(component.create());
+        QVERIFY(obj);
+    }
+    {
+        QQmlComponent component(&engine, testFileUrl("qrc.qml"));
+        checkNoErrors(component);
+        QScopedPointer<QObject> obj(component.create());
+        QVERIFY(obj);
+    }
+}
+
 QTEST_MAIN(tst_qquickfolderlistmodel)
 
 #include "tst_qquickfolderlistmodel.moc"