summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2010-01-07 03:39:24 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2010-01-07 03:39:24 (GMT)
commit3b10e20d8230d1b6044ab5c96ffdb24bc37f85da (patch)
treefb6fb3779a10a584a4c9e9fb52bc7db350fffc08
parent529294225455440f55232cb6f2bdae3b7bdf250b (diff)
downloadQt-3b10e20d8230d1b6044ab5c96ffdb24bc37f85da.zip
Qt-3b10e20d8230d1b6044ab5c96ffdb24bc37f85da.tar.gz
Qt-3b10e20d8230d1b6044ab5c96ffdb24bc37f85da.tar.bz2
opt: move expr out of loop
-rw-r--r--src/declarative/qml/qmlcompositetypemanager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlcompositetypemanager.cpp b/src/declarative/qml/qmlcompositetypemanager.cpp
index d59fe4e..ff786cf 100644
--- a/src/declarative/qml/qmlcompositetypemanager.cpp
+++ b/src/declarative/qml/qmlcompositetypemanager.cpp
@@ -459,9 +459,9 @@ int QmlCompositeTypeManager::resolveTypes(QmlCompositeTypeData *unit)
if (dot < 0) dot = imp.version.length();
QString qmldir;
if (imp.type == QmlScriptParser::Import::File && imp.qualifier.isEmpty()) {
- QUrl importUrl = unit->imports.baseUrl().resolved(QUrl(imp.uri + QLatin1String("/qmldir")));
+ QString importUrl = unit->imports.baseUrl().resolved(QUrl(imp.uri + QLatin1String("/qmldir"))).toString();
for (int ii = 0; ii < unit->resources.count(); ++ii) {
- if (unit->resources.at(ii)->url == importUrl.toString()) {
+ if (unit->resources.at(ii)->url == importUrl) {
qmldir = QString::fromUtf8(unit->resources.at(ii)->data);
break;
}