Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7

Conflicts:
	src/plugins/bearer/corewlan/qcorewlanengine.mm

1 files changed, 9 insertions, 2 deletions

diff --git a/tools/runonphone/trksignalhandler.cpp b/tools/runonphone/trksignalhandler.cpp
index 18a2c0c..2abf91f 100644
--- a/tools/runonphone/trksignalhandler.cpp
+++ b/tools/runonphone/trksignalhandler.cpp
@@ -54,6 +54,7 @@ private:
     QTextStream out;
     QTextStream err;
     int loglevel;
+    int lastpercent;
 };
 
 void TrkSignalHandler::copyingStarted()
@@ -131,7 +132,12 @@ void TrkSignalHandler::applicationOutputReceived(const QString &output)
 void TrkSignalHandler::copyProgress(int percent)
 {
     if (d->loglevel > 0) {
-        d->out << percent << "% ";
+        if (d->lastpercent == 0)
+            d->out << "[                                                 ]\r[" << flush;
+        while (percent > d->lastpercent) {
+            d->out << QLatin1Char('#');
+            d->lastpercent+=2; //because typical console is 80 chars wide
+        }
         d->out.flush();
         if (percent==100)
             d->out << endl;
@@ -167,7 +173,8 @@ void TrkSignalHandler::timeout()
 TrkSignalHandlerPrivate::TrkSignalHandlerPrivate()
     : out(stdout),
     err(stderr),
-    loglevel(0)
+    loglevel(0),
+    lastpercent(0)
 {
 
 }