summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlengine.cpp
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-09-01 03:39:38 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-09-01 03:39:38 (GMT)
commite15129c0fb995fcfc120aa4b6e7ec56f9254d10b (patch)
treed72cee67b4809455cb775376707d843a2041b716 /src/declarative/qml/qmlengine.cpp
parent49e4975e96ac9e2e8e6af1c58d3ed1453a130eb4 (diff)
parent25aaa830addf7f9082ed22a34d2f5ff8e89cf4f9 (diff)
downloadQt-e15129c0fb995fcfc120aa4b6e7ec56f9254d10b.zip
Qt-e15129c0fb995fcfc120aa4b6e7ec56f9254d10b.tar.gz
Qt-e15129c0fb995fcfc120aa4b6e7ec56f9254d10b.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.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index cc0d4c5..eaa1012 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -1222,6 +1222,7 @@ public:
if (prefix.isEmpty()) {
if (importType == QmlScriptParser::Import::Library && !vmaj && !vmin) {
// unversioned library imports are always qualified - if only by final URI component
+ // XXX we need not support this
int lastdot = uri.lastIndexOf(QLatin1Char('.'));
QString defaultprefix = uri.mid(lastdot+1);
s = set.value(defaultprefix);
@@ -1253,10 +1254,10 @@ public:
} else {
url = base.resolved(QUrl(url)).toString();
}
- s->urls.append(url);
- s->majversions.append(vmaj);
- s->minversions.append(vmin);
- s->isLibrary.append(importType == QmlScriptParser::Import::Library);
+ s->urls.prepend(url);
+ s->majversions.prepend(vmaj);
+ s->minversions.prepend(vmin);
+ s->isLibrary.prepend(importType == QmlScriptParser::Import::Library);
return true;
}