summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-11-19 06:34:05 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-11-19 06:34:05 (GMT)
commit1119a86b9752a1a58dade499a2884b89b2275a57 (patch)
tree317217576d0dbcdf45275c9fdafede7cf9581fe4
parentac62887fe00eb22ea00622d4c3dab5ff40417e76 (diff)
downloadQt-1119a86b9752a1a58dade499a2884b89b2275a57.zip
Qt-1119a86b9752a1a58dade499a2884b89b2275a57.tar.gz
Qt-1119a86b9752a1a58dade499a2884b89b2275a57.tar.bz2
Allow testing of raster engine on Mac from qmlviewer
-rw-r--r--tools/qml/main.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 579f1ab..209c72f 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -155,7 +155,11 @@ void usage()
qWarning(" -I <directory> ........................... prepend to the module import search path,");
qWarning(" display path if <directory> is empty");
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");
+#else
qWarning(" -opengl .................................. use a QGLWidget for the viewport");
+#endif
qWarning(" -script <path> ........................... set the script to use");
qWarning(" -scriptopts <options>|help ............... set the script options to use");
@@ -370,8 +374,13 @@ 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") {