diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-11-16 07:42:27 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-11-16 07:42:27 (GMT) |
| commit | 539f7d9f4055a511d2820d19963ba0340983f8b1 (patch) | |
| tree | 0ce10d4d4f28aee7a4c35ceeddd45b564d941120 /src/declarative | |
| parent | 1c029319fb787c1ef6bce0f76fff991679b944f2 (diff) | |
| parent | 6b0c2119fc87be3a512d312e8ddfd77d1aa3607b (diff) | |
| download | Qt-539f7d9f4055a511d2820d19963ba0340983f8b1.zip Qt-539f7d9f4055a511d2820d19963ba0340983f8b1.tar.gz Qt-539f7d9f4055a511d2820d19963ba0340983f8b1.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/qml/qmlcompositetypemanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlcompositetypemanager.cpp b/src/declarative/qml/qmlcompositetypemanager.cpp index 7dbe788..fa68951 100644 --- a/src/declarative/qml/qmlcompositetypemanager.cpp +++ b/src/declarative/qml/qmlcompositetypemanager.cpp @@ -168,6 +168,7 @@ QmlCompositeTypeData *QmlCompositeTypeManager::get(const QUrl &url) if (!unit) { unit = new QmlCompositeTypeData; unit->status = QmlCompositeTypeData::Waiting; + unit->progress = 0.0; unit->imports.setBaseUrl(url); components.insert(url.toString(), unit); @@ -217,7 +218,6 @@ void QmlCompositeTypeManager::replyFinished() Q_ASSERT(unit); if (reply->error() != QNetworkReply::NoError) { - QString errorDescription; // ### - Fill in error errorDescription = QLatin1String("Network error for URL ") + |