summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-01-11 05:41:50 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-01-11 05:41:50 (GMT)
commitac6c8a4d8870011cf7d999d8999d0e9c61e9e89e (patch)
tree052e9d68ebdb0e9eec4a9f5d1acfeefb20885c4a
parent25eddc815fe87d04616edd9cc1d37253b1d43246 (diff)
downloadQt-ac6c8a4d8870011cf7d999d8999d0e9c61e9e89e.zip
Qt-ac6c8a4d8870011cf7d999d8999d0e9c61e9e89e.tar.gz
Qt-ac6c8a4d8870011cf7d999d8999d0e9c61e9e89e.tar.bz2
Use URI, not modified URL when resolving type names
-rw-r--r--src/declarative/qml/qmlengine.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 5479463..2d86e09 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -1299,11 +1299,11 @@ static QmlTypeNameCache *cacheForNamespace(QmlEngine *engine, const QmlEnginePri
QList<QmlType *> types = QmlMetaType::qmlTypes();
- for (int ii = 0; ii < set.urls.count(); ++ii) {
+ for (int ii = 0; ii < set.uris.count(); ++ii) {
if (!set.isBuiltin.at(ii))
continue;
- QByteArray base = set.urls.at(ii).toUtf8() + '/';
+ QByteArray base = set.uris.at(ii).toUtf8() + '/';
int major = set.majversions.at(ii);
int minor = set.minversions.at(ii);