aboutsummaryrefslogtreecommitdiffstats
path: root/share/qtcreator/qml/qmlobserver/main.cpp
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2010-10-06 14:09:07 +0200
committerKai Koehne <kai.koehne@nokia.com>2010-10-06 14:59:25 +0200
commit5532f939b5d6d78ca6470b2fc9e20fff77c663c4 (patch)
tree3fdded3ef1ee0cab54f1404a931e18114d45a66f /share/qtcreator/qml/qmlobserver/main.cpp
parentda7dd6181a3585568e75b1d29644cad4aaa612b9 (diff)
QmlObserver: Fix compilation if no private headers are installed
Don't support the Recording + Test Script features if there are no private headers installed. Reviewed-by: Lasse Holmstedt
Diffstat (limited to 'share/qtcreator/qml/qmlobserver/main.cpp')
-rw-r--r--share/qtcreator/qml/qmlobserver/main.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/share/qtcreator/qml/qmlobserver/main.cpp b/share/qtcreator/qml/qmlobserver/main.cpp
index f04640d970..6733265b2f 100644
--- a/share/qtcreator/qml/qmlobserver/main.cpp
+++ b/share/qtcreator/qml/qmlobserver/main.cpp
@@ -113,7 +113,7 @@ void myMessageOutput(QtMsgType type, const char *msg)
void usage()
{
- qWarning("Usage: qmlviewer [options] <filename>");
+ qWarning("Usage: qmlobserver [options] <filename>");
qWarning(" ");
qWarning(" options:");
qWarning(" -v, -version ............................. display version");
@@ -125,6 +125,7 @@ void usage()
qWarning(" -sizerootobjecttoview .................... the content resizes to the changes in the view (default)");
qWarning(" -qmlbrowser .............................. use a QML-based file browser");
qWarning(" -warnings [show|hide]..................... show warnings in a separate log window");
+#ifndef NO_PRIVATE_HEADERS
qWarning(" -recordfile <output> ..................... set video recording file");
qWarning(" - ImageMagick 'convert' for GIF)");
qWarning(" - png file for raw frames");
@@ -133,6 +134,7 @@ void usage()
qWarning(" -recordrate <fps> ........................ set recording frame rate");
qWarning(" -record arg .............................. add a recording process argument");
qWarning(" -autorecord [from-]<tomilliseconds> ...... set recording to start and stop");
+#endif
qWarning(" -devicekeys .............................. use numeric keys (see F1)");
qWarning(" -dragthreshold <size> .................... set mouse drag threshold size");
qWarning(" -netcache <size> ......................... set disk cache to size bytes");
@@ -141,8 +143,10 @@ void usage()
qWarning(" display path if <directory> is empty");
qWarning(" -P <directory> ........................... prepend to the plugin search path");
qWarning(" -opengl .................................. use a QGLWidget for the viewport");
+#ifndef NO_PRIVATE_HEADERS
qWarning(" -script <path> ........................... set the script to use");
qWarning(" -scriptopts <options>|help ............... set the script options to use");
+#endif
qWarning(" ");
qWarning(" Press F1 for interactive help");
@@ -151,7 +155,7 @@ void usage()
void scriptOptsUsage()
{
- qWarning("Usage: qmlviewer -scriptopts <option>[,<option>...] ...");
+ qWarning("Usage: qmlobserver -scriptopts <option>[,<option>...] ...");
qWarning(" options:");
qWarning(" record ................................... record a new script");
qWarning(" play ..................................... playback an existing script");