From 8c724518e2d2f68442cedbfd09cb84c545438cba Mon Sep 17 00:00:00 2001
From: mae <qt-info@nokia.com>
Date: Wed, 17 Mar 2010 13:49:44 +0100
Subject: Fix type lookup with url

The existence of a non-empty qmldir file (e.g. for defining
a plugin) should not change the lookup rules for qml files
via url
---
 src/declarative/qml/qdeclarativeengine.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index f4eeff4..f655151 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -1404,14 +1404,14 @@ struct QDeclarativeEnginePrivate::ImportedNamespace {
                     }
                 }
 
-            } else {
-                // XXX search non-files too! (eg. zip files, see QT-524)
-                QFileInfo f(toLocalFileOrQrc(url));
-                if (f.exists()) {
-                    if (url_return)
-                        *url_return = url;
-                    return true;
-                }
+            }
+
+            // XXX search non-files too! (eg. zip files, see QT-524)
+            QFileInfo f(toLocalFileOrQrc(url));
+            if (f.exists()) {
+                if (url_return)
+                    *url_return = url;
+                return true;
             }
         }
         return false;
-- 
cgit v0.12