diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-01-08 07:13:41 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-01-08 07:13:41 (GMT) |
| commit | feb5ce61c843ad4e06c7d83665664ffbac520c06 (patch) | |
| tree | 6a410e56826cae418e334be1d03b7bc45f9e0acd /src | |
| parent | 17cdfc4b612d0f03bdcc42d4cc00ad8b27202e12 (diff) | |
| download | Qt-feb5ce61c843ad4e06c7d83665664ffbac520c06.zip Qt-feb5ce61c843ad4e06c7d83665664ffbac520c06.tar.gz Qt-feb5ce61c843ad4e06c7d83665664ffbac520c06.tar.bz2 | |
Must always ask factory loader, or else plugins will only load the second time.
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/qml/qmlengine.cpp | 11 |
1 files 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(); } |