TRK: Fixed spacing problem console output

diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
index 130ebee..7a98fc5 100644 (file)
--- a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
@@ -343,6 +343,7 @@ void S60DeployStep::setupConnections()
         connect(m_launcher, SIGNAL(finished()), this, SLOT(launcherFinished()));
         connect(m_launcher, SIGNAL(canNotConnect(QString)), this, SLOT(connectFailed(QString)));
         connect(m_launcher, SIGNAL(copyingStarted(QString)), this, SLOT(printCopyingNotice(QString)));
+        connect(m_launcher, SIGNAL(fileCopied(QString)), this, SLOT(printCopyingFinished(QString)));
         connect(m_launcher, SIGNAL(canNotCreateFile(QString,QString)), this, SLOT(createFileFailed(QString,QString)));
         connect(m_launcher, SIGNAL(canNotWriteFile(QString,QString)), this, SLOT(writeFileFailed(QString,QString)));
         connect(m_launcher, SIGNAL(canNotCloseFile(QString,QString)), this, SLOT(closeFileFailed(QString,QString)));
@@ -748,6 +749,12 @@ void S60DeployStep::printCopyingNotice(const QString &fileName)
     appendMessage(tr("Copying \"%1\"...").arg(fileName), false);
 }
 
+void S60DeployStep::printCopyingFinished(const QString &fileName)
+{
+    Q_UNUSED(fileName)
+    appendMessage(QLatin1String("\n"), false);
+}
+
 void S60DeployStep::printInstallingNotice(const QString &packageName)
 {
     appendMessage(tr("Installing package \"%1\" on drive %2:...").arg(packageName).arg(m_installationDrive), false);

diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.h b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.h
index e6d7d29..7f5fa9d 100644 (file)
--- a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.h
@@ -113,6 +113,7 @@ protected slots:
 private slots:
     void connectFailed(const QString &errorMessage);
     void printCopyingNotice(const QString &fileName);
+    void printCopyingFinished(const QString &fileName);
     void createFileFailed(const QString &filename, const QString &errorMessage);
     void writeFileFailed(const QString &filename, const QString &errorMessage);
     void closeFileFailed(const QString &filename, const QString &errorMessage);

diff --git a/src/shared/symbianutils/launcher.cpp b/src/shared/symbianutils/launcher.cpp
index 3afb931..6306208 100644 (file)
--- a/src/shared/symbianutils/launcher.cpp
+++ b/src/shared/symbianutils/launcher.cpp
@@ -719,6 +719,7 @@ void Launcher::handleFileCopied(const TrkResult &result)
 {
     if (result.errorCode())
         emit canNotCloseFile(d->m_copyState.destinationFileNames.at(d->m_copyState.currentFileName), result.errorString());
+    emit fileCopied(d->m_copyState.destinationFileNames.at(d->m_copyState.currentFileName));
 
     ++d->m_copyState.currentFileName;
 

diff --git a/src/shared/symbianutils/launcher.h b/src/shared/symbianutils/launcher.h
index ab66658..4e11f14 100644 (file)
--- a/src/shared/symbianutils/launcher.h
+++ b/src/shared/symbianutils/launcher.h
@@ -139,6 +139,7 @@ public:
 signals:
     void deviceDescriptionReceived(const QString &port, const QString &description);
     void copyingStarted(const QString &fileName);
+    void fileCopied(const QString &fileName);
     void canNotConnect(const QString &errorMessage);
     void canNotCreateFile(const QString &filename, const QString &errorMessage);
     void canNotOpenFile(const QString &filename, const QString &errorMessage);