From 849694e4cb9d010517b54b2b30035485487b0e12 Mon Sep 17 00:00:00 2001
From: mread <qt-info@nokia.com>
Date: Wed, 21 Sep 2011 11:35:14 +0100
Subject: QML import path puts Qt dirs in correct Symbian order

The QML import path contains an entry for the standard
import location on each drive on Symbian. These were
being ordered so that Z:, the ROM drive, was listed
first. In fact the drive order was the reverse of the
normal Symbian drive search order. This had the effect
that upgraded versions of QML imports installed on
the device were generally ignored for older ROM based
versions.

The import path has now been changed to match the normal
Symbian drive search order. This will make it more likely
for upgraded QML imports to be picked up and used.

Task-number: QTBUG-21409
Reviewed-by: Shane Kearns
Reviewed-by: Martin Jones
---
 .../tst_qdeclarativemoduleplugin.cpp               | 25 ++++++++++++++++++++++
 .../tst_qdeclarativemoduleplugin.pro               |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp
index 2cc297171c..96bea68fca 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp
@@ -43,6 +43,7 @@
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativecomponent.h>
 #include <QDebug>
+#include <QtCore/qlibraryinfo.h>
 
 #include "../shared/testhttpserver.h"
 #include "../../../shared/util.h"
@@ -70,6 +71,7 @@ private slots:
     void remoteImportWithUnquotedUri();
     void versionNotInstalled();
     void versionNotInstalled_data();
+    void importPath();
 };
 
 #ifdef Q_OS_SYMBIAN
@@ -308,6 +310,29 @@ void tst_qdeclarativemoduleplugin::versionNotInstalled()
     VERIFY_ERRORS(errorFile.toLatin1().constData());
 }
 
+void tst_qdeclarativemoduleplugin::importPath()
+{
+#ifndef Q_OS_SYMBIAN
+    QSKIP("Import path order testing for Symbian only", SkipAll);
+#else
+    QDeclarativeEngine engine;
+    QStringList imports = engine.importPathList();
+    QString installImportsPath = QDir::cleanPath(QLibraryInfo::location(QLibraryInfo::ImportsPath));
+    QString driveOrder(QLatin1String("ZABCDEFGHIJKLMNOPQRSTUVWXY"));
+    int lastOrder = 30;
+    foreach(QString import, imports)
+    {
+        if (import.endsWith(installImportsPath))
+        {
+            int order = driveOrder.indexOf(import[0]);
+            QVERIFY(order < lastOrder);
+            lastOrder = order;
+        }
+    }
+    QVERIFY(lastOrder != 30);
+#endif
+}
+
 QTEST_MAIN(tst_qdeclarativemoduleplugin)
 
 #include "tst_qdeclarativemoduleplugin.moc"
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro
index a92d3a256f..2716a8bdf5 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro
@@ -9,7 +9,7 @@ CONFIG -= app_bundle
 symbian: {
     importFiles.sources = data
     importFiles.path = .
-    DEPLOYMENT = importFiles
+    DEPLOYMENT += importFiles
 } else {
     DEFINES += SRCDIR=\\\"$$PWD\\\"
 }
-- 
cgit v1.2.3