summaryrefslogtreecommitdiffstats
path: root/tools/qml
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2010-05-19 06:23:52 (GMT)
committerKai Koehne <kai.koehne@nokia.com>2010-05-19 06:23:52 (GMT)
commit399bb3dbeacc1d055191c200bbbc2ab262a8eb9b (patch)
tree24e1fb6c10196b72cbd2a7a4dc68e28706e0aba0 /tools/qml
parent21a6df92c22d8b39b61f9d946b576089e046061d (diff)
downloadQt-399bb3dbeacc1d055191c200bbbc2ab262a8eb9b.zip
Qt-399bb3dbeacc1d055191c200bbbc2ab262a8eb9b.tar.gz
Qt-399bb3dbeacc1d055191c200bbbc2ab262a8eb9b.tar.bz2
Rename qml executable to qmlviewer
Revert the name of the 'qml' executable back to qmlviewer (QMLViewer on mac).
Diffstat (limited to 'tools/qml')
-rw-r--r--tools/qml/main.cpp4
-rw-r--r--tools/qml/qml.pro2
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 22fc5ca..0cce1cc 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -110,7 +110,7 @@ void myMessageOutput(QtMsgType type, const char *msg)
void usage()
{
- qWarning("Usage: qml [options] <filename>");
+ qWarning("Usage: qmlviewer [options] <filename>");
qWarning(" ");
qWarning(" options:");
qWarning(" -v, -version ............................. display version");
@@ -148,7 +148,7 @@ void usage()
void scriptOptsUsage()
{
- qWarning("Usage: qml -scriptopts <option>[,<option>...] ...");
+ qWarning("Usage: qmlviewer -scriptopts <option>[,<option>...] ...");
qWarning(" options:");
qWarning(" record ................................... record a new script");
qWarning(" play ..................................... playback an existing script");
diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro
index 886f0d9..9cdec77 100644
--- a/tools/qml/qml.pro
+++ b/tools/qml/qml.pro
@@ -39,4 +39,6 @@ mac {
QMAKE_INFO_PLIST=Info_mac.plist
TARGET=QMLViewer
ICON=qml.icns
+} else {
+ TARGET=qmlviewer
}