From feb5ce61c843ad4e06c7d83665664ffbac520c06 Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Fri, 8 Jan 2010 17:13:41 +1000
Subject: Must always ask factory loader, or else plugins will only load the
 second time.

---
 src/declarative/qml/qmlengine.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 708cdd1..9c795bd 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -1200,13 +1200,12 @@ public:
             if (!found) {
                 // XXX assume it is a built-in type qualifier
                 isbuiltin = true;
-            } else {
-                QFactoryLoader *l = loader();
-                QmlModuleFactoryInterface *factory =
-                    qobject_cast<QmlModuleFactoryInterface*>(l->instance(uri));
-                if (factory)
-                    isbuiltin = true;
             }
+            QFactoryLoader *l = loader();
+            QmlModuleFactoryInterface *factory =
+                qobject_cast<QmlModuleFactoryInterface*>(l->instance(uri));
+            if (factory)
+                isbuiltin = true;
         } else {
             url = base.resolved(QUrl(url)).toString();
         }
-- 
cgit v0.12