Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (77 commits)
  Recompute the source location of regexp literals.
  Adds a way to  clear the state list property in QDeclarativeStateGroup
  I've been told this fixes compilation on windows.
  Doc Augmentation
  Added highlight ranges/modes to PathView
  Use QThread IdlePriority rather than linux platform code.
  Test and fix order of transform application.
  Test transforms.
  Fix namespace.
  Simple case, no size returned.
  sourceWidth/sourceHeight -> sourceSize
  QDeclarativeItem don't need to emit childrenChanged anymore.
  Control of image rendered size (esp. SVG).
  Do not call parent implementation if we accept the keyPressEvent in GridView and ListView delegates.
  Update test.
  Add autotest for QTBUG-9367.
  Remove Q prefix from the validators.
  Really fix qMin() parameter types.
  Add declarative subdir to examples.pro
  Add Symbian deploy section for qml import plugins
  ...

1 files changed, 10 insertions, 8 deletions

diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 2f0ec24..ad26650 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -1405,7 +1405,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)
@@ -1494,10 +1496,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())
@@ -1557,9 +1559,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();