summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-06-29 19:19:04 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-06-29 19:19:04 (GMT)
commit81e19a4621f59d893403a0b79770c4623efc5c3d (patch)
treef726e47935c69e87a3c5f7a71bd2d394cbcbc486
parent564d2a31a1fd7dfff9a4f6cc2ae814d9307e88a9 (diff)
parentd5301d0b54b334d4f2e4e7d460d02303a18b5e22 (diff)
downloadQt-81e19a4621f59d893403a0b79770c4623efc5c3d.zip
Qt-81e19a4621f59d893403a0b79770c4623efc5c3d.tar.gz
Qt-81e19a4621f59d893403a0b79770c4623efc5c3d.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: 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 737bfd0..727fad9 100644
--- a/tools/linguist/lupdate/main.cpp
+++ b/tools/linguist/lupdate/main.cpp
@@ -61,12 +61,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 {