diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-22 21:35:27 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-22 21:35:27 (GMT) |
commit | 57b2c5860825fb096d1e45582b06f4c77effb8ca (patch) | |
tree | 1fed283316caf31dafdfa04b18b6fa5993520952 /tools/linguist/lconvert | |
parent | 4f2338d460c5511fa3c31b4e6e438703736006d8 (diff) | |
parent | fe3b07884cf2a9c02a5dc3a8fc7aebcd42a5ee91 (diff) | |
download | Qt-57b2c5860825fb096d1e45582b06f4c77effb8ca.zip Qt-57b2c5860825fb096d1e45582b06f4c77effb8ca.tar.gz Qt-57b2c5860825fb096d1e45582b06f4c77effb8ca.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:
sort out stdout vs. stderr usage
Changes for 4.7.3
Diffstat (limited to 'tools/linguist/lconvert')
-rw-r--r-- | tools/linguist/lconvert/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/linguist/lconvert/main.cpp b/tools/linguist/lconvert/main.cpp index a10a42b..a9960fc 100644 --- a/tools/linguist/lconvert/main.cpp +++ b/tools/linguist/lconvert/main.cpp @@ -65,7 +65,7 @@ static int usage(const QStringList &args) foreach (Translator::FileFormat format, Translator::registeredFileFormats()) loaders += line.arg(format.extension, -5).arg(format.description); - std::cerr << qPrintable(LC::tr("\nUsage:\n" + std::cout << qPrintable(LC::tr("\nUsage:\n" " lconvert [options] <infile> [<infile>...]\n\n" "lconvert is part of Qt's Linguist tool chain. It can be used as a\n" "stand-alone tool to convert and filter translation data files.\n" |