From a701a744a1e292803823c43aad4d81a9cff25a32 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Thu, 25 Mar 2010 09:33:17 +0100
Subject: Forgot to add a file.

Forgot to add these, the primary changes, to commit
870dbc7542beb07b84378f356cbe568a2ae8b7e1
---
 src/declarative/qml/qdeclarativeengine.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index d4872e2..164fab7 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -1390,7 +1390,9 @@ struct QDeclarativeEnginePrivate::ImportedNamespace {
                 foreach (const QDeclarativeDirParser::Component &c, qmldircomponents) {
                     if (c.typeName == typeName) {
                         typeWasDeclaredInQmldir = true;
-                        if (c.majorVersion < vmaj || (c.majorVersion == vmaj && vmin >= c.minorVersion)) {
+
+                        // importing version -1 means import ALL versions
+                        if ((vmaj == -1) || (c.majorVersion < vmaj || (c.majorVersion == vmaj && vmin >= c.minorVersion))) {
                             QUrl candidate = url.resolved(QUrl(c.fileName));
                             if (c.internal && base) {
                                 if (base->resolved(QUrl(c.fileName)) != candidate)
@@ -1479,10 +1481,10 @@ public:
 
         QStringList paths;
 
-        if (!base.isEmpty()) {
-            QString baseDir = QFileInfo(toLocalFileOrQrc(base)).path();
-            paths += baseDir;
-        }
+//        if (!base.isEmpty()) {
+//            QString baseDir = QFileInfo(toLocalFileOrQrc(base)).path();
+//            paths += baseDir;
+//        }
 
         QString applicationDirPath = QCoreApplication::applicationDirPath();
         if (!applicationDirPath.isEmpty())
@@ -1542,9 +1544,9 @@ public:
             // user import paths
             QStringList paths;
             // base..
-            QString localFileOrQrc = toLocalFileOrQrc(base);
-            QString localFileOrQrcPath = QFileInfo(localFileOrQrc).path();
-            paths += localFileOrQrcPath;
+//            QString localFileOrQrc = toLocalFileOrQrc(base);
+//            QString localFileOrQrcPath = QFileInfo(localFileOrQrc).path();
+//            paths += localFileOrQrcPath;
             paths += QDeclarativeEnginePrivate::get(engine)->fileImportPath;
 
             QString applicationDirPath = QCoreApplication::applicationDirPath();
-- 
cgit v0.12