diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-01-11 01:16:08 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-01-11 01:16:08 (GMT) |
| commit | e1dfba9da8e093255c6020cb61b1b0ea68d2c012 (patch) | |
| tree | 94fd26a3316dde5e9a193b984f51312c8877887f /src/declarative/qml/qmlengine.cpp | |
| parent | a657665e31e9fdabfc4e3913b4656046efe8b78d (diff) | |
| parent | 959ab5d84d67ec84c2342b083e362ca75613e8cb (diff) | |
| download | Qt-e1dfba9da8e093255c6020cb61b1b0ea68d2c012.zip Qt-e1dfba9da8e093255c6020cb61b1b0ea68d2c012.tar.gz Qt-e1dfba9da8e093255c6020cb61b1b0ea68d2c012.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlengine.cpp')
| -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 19a20e8..5479463 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -1197,13 +1197,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(); } |