diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-01-11 05:48:43 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-01-11 05:48:43 (GMT) |
| commit | aa6ec25bdf0e69873b537e05d4511543b21f3e8a (patch) | |
| tree | 7ca99c20c7cb5acdce8b111dd0eba72c372ec3df /src/declarative/qml/qmlengine.cpp | |
| parent | 5832eb0354634efd29cbe55558000e51cb68ec40 (diff) | |
| parent | 8fa3f3f7f038f10dcd2bbd160f04275fe0efaadf (diff) | |
| download | Qt-aa6ec25bdf0e69873b537e05d4511543b21f3e8a.zip Qt-aa6ec25bdf0e69873b537e05d4511543b21f3e8a.tar.gz Qt-aa6ec25bdf0e69873b537e05d4511543b21f3e8a.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@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 | 4 |
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); |