diff options
| -rw-r--r-- | doc/src/declarative/qmlruntime.qdoc | 8 | ||||
| -rw-r--r-- | tools/qml/main.cpp | 4 | ||||
| -rw-r--r-- | tools/qml/qml.pro | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/doc/src/declarative/qmlruntime.qdoc b/doc/src/declarative/qmlruntime.qdoc index a03b9c2..cef5e63 100644 --- a/doc/src/declarative/qmlruntime.qdoc +++ b/doc/src/declarative/qmlruntime.qdoc @@ -42,7 +42,7 @@ /*! \page qmlruntime.html \title Qt Declarative UI Runtime - \keyword QML Viewer (qml) + \keyword QML Viewer \ingroup qttools This page documents the \e{Declarative UI Runtime} for the Qt GUI @@ -67,7 +67,7 @@ To run an application with the \QQV, pass the filename as an argument: \code - qml myQmlFile.qml + qmlviewer myQmlFile.qml \endcode Deploying a QML application via the \QQV allows for QML only deployments, but can also @@ -92,7 +92,7 @@ as the appropriate module file is chosen based on platform naming conventions. The C++ modules must contain a QDeclarativeExtentionPlugin subclass. - The application would be executed either with your own application, the command 'qml MyApp.qml' or by + The application would be executed either with your own application, the command 'qmlviewer MyApp.qml' or by opening the file if your system has the \QQV registered as the handler for QML files. The MyApp.qml file would have access to all of the deployed types using the import statements such as the following: @@ -109,7 +109,7 @@ \section2 Options - When run with the \c -help option, \c qml shows available options. + When run with the \c -help option, \c qmlviewer shows available options. \section2 Translations 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 } |