summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativeengine.cpp
diff options
context:
space:
mode:
authormae <qt-info@nokia.com>2010-03-17 11:39:47 (GMT)
committermae <qt-info@nokia.com>2010-03-17 11:41:08 (GMT)
commit144e450292b4d33e72223626e4146f8e9efb8c9b (patch)
tree32aad3da1f5ffa757e5d76aeb94f468d0b05c941 /src/declarative/qml/qdeclarativeengine.cpp
parentd54b11fef6403693de09277a645c9666f8eea6a2 (diff)
downloadQt-144e450292b4d33e72223626e4146f8e9efb8c9b.zip
Qt-144e450292b4d33e72223626e4146f8e9efb8c9b.tar.gz
Qt-144e450292b4d33e72223626e4146f8e9efb8c9b.tar.bz2
Add an implicit import "." to types loaded from a local url
This triggers the loading of the qmldir and the import of native types from available plugins. The change puts native types on par with types defined in qml files.
Diffstat (limited to 'src/declarative/qml/qdeclarativeengine.cpp')
-rw-r--r--src/declarative/qml/qdeclarativeengine.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 7c21ab8..f4eeff4 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -1342,6 +1342,7 @@ QVariant QDeclarativeScriptClass::toVariant(QDeclarativeEngine *engine, const QS
}
// XXX this beyonds in QUrl::toLocalFile()
+// WARNING, there is a copy of this function in qdeclarativecompositetypemanager.cpp
static QString toLocalFileOrQrc(const QUrl& url)
{
if (url.scheme() == QLatin1String("qrc")) {