feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Locator: Compile with QT_NO_CAST_FROM_ASCII.

Browse Source 
Change-Id: I7b4b5e25aba9f2de9cbfde0f4553685cd4e01346
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-01-20 15:56:00 +01:00
parent fa20c2a95e
commit f5aa8d4658
10 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/qtconcurrent/multitask.h
View File

@@ -163,8 +163,10 @@ private:
{
QString text;
foreach (QFutureWatcher<R> *watcher, watchers) {
if (!watcher->progressText().isEmpty())
text += watcher->progressText() + "\n";
if (!watcher->progressText().isEmpty()) {
text += watcher->progressText();
text += QLatin1Char('\n');
}
}
text = text.trimmed();
futureInterface.setProgressValueAndText(futureInterface.progressValue(), text);