summaryrefslogtreecommitdiffstats
path: root/tools/qml
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2011-02-04 14:02:21 +1000
committerAlan Alpert <alan.alpert@nokia.com>2011-02-04 14:02:21 +1000
commitb82332fec19ee977eceaf2d533ee027020a474e0 (patch)
treefb1c7f1ece41f204d334d70ebcecec14e34d6a62 /tools/qml
parent2aa55af392f527b9357ca227d853a2ee5e340f35 (diff)
Make -no-opengl exist on other platforms
Task-Number: QTBUG-15830
Diffstat (limited to 'tools/qml')
-rw-r--r--tools/qml/main.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 5846ff01f5..67154dd6ea 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -161,7 +161,9 @@ void usage()
qWarning(" -P <directory> ........................... prepend to the plugin search path");
#if defined(Q_WS_MAC)
qWarning(" -no-opengl ............................... don't use a QGLWidget for the viewport");
+ qWarning(" -opengl .................................. use a QGLWidget for the viewport (default)");
#else
+ qWarning(" -no-opengl ............................... don't use a QGLWidget for the viewport (default)");
qWarning(" -opengl .................................. use a QGLWidget for the viewport");
#endif
qWarning(" -script <path> ........................... set the script to use");
@@ -380,13 +382,10 @@ static void parseCommandLineOptions(const QStringList &arguments)
} else if (arg == "-translation") {
if (lastArg) usage();
opts.translationFile = arguments.at(++i);
-#if defined(Q_WS_MAC)
} else if (arg == "-no-opengl") {
opts.useGL = false;
-#else
} else if (arg == "-opengl") {
opts.useGL = true;
-#endif
} else if (arg == "-qmlbrowser") {
opts.useNativeFileBrowser = false;
} else if (arg == "-warnings") {