summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-06-27 11:38:51 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-06-27 11:38:51 (GMT)
commiteadf2bbf49e906f43421fc31fd76ba9812a545f4 (patch)
tree06bc108b39aa45df59e8aaaf86bd7285758fd3a5
parentc7fbfa24ede337a7e38d4436a927368d8d461621 (diff)
parentfd7ba9728a9a580fc446b71134d4c0647c235b4f (diff)
downloadQt-eadf2bbf49e906f43421fc31fd76ba9812a545f4.zip
Qt-eadf2bbf49e906f43421fc31fd76ba9812a545f4.tar.gz
Qt-eadf2bbf49e906f43421fc31fd76ba9812a545f4.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging: QTBUG-19500 lupdate fails to run from the Mac binary package on Mac OS X 10.5
-rw-r--r--tools/linguist/lupdate/main.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/linguist/lupdate/main.cpp b/tools/linguist/lupdate/main.cpp
index 34bb792..ab88083 100644
--- a/tools/linguist/lupdate/main.cpp
+++ b/tools/linguist/lupdate/main.cpp
@@ -62,12 +62,14 @@ static QString m_defaultExtensions;
static void printOut(const QString & out)
{
- std::cout << qPrintable(out);
+ QTextStream stream(stdout);
+ stream << out;
}
static void printErr(const QString & out)
{
- std::cerr << qPrintable(out);
+ QTextStream stream(stderr);
+ stream << out;
}
class LU {