summaryrefslogtreecommitdiffstats
path: root/installerbuilder/libinstaller/getrepositorymetainfojob.cpp
diff options
context:
space:
mode:
authorkh1 <qt-info@nokia.com>2011-05-03 13:32:15 +0200
committerkh1 <qt-info@nokia.com>2011-05-03 13:32:15 +0200
commit11198cbdb2e4f08e68370d5212a310c1c30e2dac (patch)
tree146537c1f17f82899df451db359e8ee9c9721d0c /installerbuilder/libinstaller/getrepositorymetainfojob.cpp
parentcc0a3e1701e1a21117b9387d5ad968537014ddf4 (diff)
Update job info message and properly forward them.
Diffstat (limited to 'installerbuilder/libinstaller/getrepositorymetainfojob.cpp')
-rw-r--r--installerbuilder/libinstaller/getrepositorymetainfojob.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/installerbuilder/libinstaller/getrepositorymetainfojob.cpp b/installerbuilder/libinstaller/getrepositorymetainfojob.cpp
index 37e390c4d..3856d6680 100644
--- a/installerbuilder/libinstaller/getrepositorymetainfojob.cpp
+++ b/installerbuilder/libinstaller/getrepositorymetainfojob.cpp
@@ -160,6 +160,8 @@ void GetRepositoryMetaInfoJob::updatesXmlDownloadCanceled()
void GetRepositoryMetaInfoJob::updatesXmlDownloadFinished()
{
+ emit infoMessage(this, tr("Retrieving component meta information..."));
+
const QString fn = m_downloader->downloadedFileName();
Q_ASSERT(!fn.isEmpty());
Q_ASSERT(QFile::exists(fn));
@@ -216,6 +218,8 @@ void GetRepositoryMetaInfoJob::updatesXmlDownloadFinished()
// .arg(QString::number(line), QString::number(col), err));
}
+ emit infoMessage(this, tr("Parsing component meta information..."));
+
const QDomElement root = doc.documentElement();
const QDomNodeList children = root.childNodes();
for (int i = 0; i < children.count(); ++i) {
@@ -240,7 +244,9 @@ void GetRepositoryMetaInfoJob::updatesXmlDownloadFinished()
emitFinished();
return;
}
- emit infoMessage(this, tr("Retrieving component meta information..."));
+
+ emit infoMessage(this, tr("Finished updating component meta information..."));
+
fetchNextMetaInfo();
}
@@ -278,6 +284,8 @@ void GetRepositoryMetaInfoJob::updatesXmlDownloadError(const QString &err)
void GetRepositoryMetaInfoJob::fetchNextMetaInfo()
{
+ emit infoMessage(this, tr("Retrieving component information from remote repository..."));
+
if (m_canceled)
return;
@@ -336,8 +344,6 @@ void GetRepositoryMetaInfoJob::fetchNextMetaInfo()
Qt::QueuedConnection);
m_downloader->download();
-
- emit infoMessage(this, tr("Retrieving component information from remote repositories..."));
}
void GetRepositoryMetaInfoJob::metaDownloadCanceled()