summaryrefslogtreecommitdiffstats
path: root/tools/qdbus
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2009-05-12 10:38:22 (GMT)
committerBradley T. Hughes <bradley.hughes@nokia.com>2009-05-12 10:38:22 (GMT)
commitcc957f4cb1a8dce2fb1eb406f54ccecb4092d238 (patch)
tree5463704092728f10a58931fba7a2a74fa71f73d0 /tools/qdbus
parentf14620878beed97c85c4b6a03a38f485800328d1 (diff)
parent8c0cdfdd4772e81164d838b9549e8c554ecf5966 (diff)
downloadQt-cc957f4cb1a8dce2fb1eb406f54ccecb4092d238.zip
Qt-cc957f4cb1a8dce2fb1eb406f54ccecb4092d238.tar.gz
Qt-cc957f4cb1a8dce2fb1eb406f54ccecb4092d238.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'tools/qdbus')
-rw-r--r--tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp b/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp
index a871fe4..d7dab0b 100644
--- a/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp
+++ b/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp
@@ -82,7 +82,6 @@ static QStringList wantedInterfaces;
static const char help[] =
"Usage: " PROGRAMNAME " [options...] [xml-or-xml-file] [interfaces...]\n"
"Produces the C++ code to implement the interfaces defined in the input file.\n"
- "If no options are given, the code is written to the standard output.\n"
"\n"
"Options:\n"
" -a <filename> Write the adaptor code to <filename>\n"
@@ -99,7 +98,10 @@ static const char help[] =
"If the file name given to the options -a and -p does not end in .cpp or .h, the\n"
"program will automatically append the suffixes and produce both files.\n"
"You can also use a colon (:) to separate the header name from the source file\n"
- "name, as in '-a filename_p.h:filename.cpp'.\n";
+ "name, as in '-a filename_p.h:filename.cpp'.\n"
+ "\n"
+ "If you pass a dash (-) as the argument to either -p or -a, the output is written\n"
+ "to the standard output\n";
static const char includeList[] =
"#include <QtCore/QByteArray>\n"