diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-19 13:17:08 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-19 13:17:08 (GMT) |
commit | d11e18b654de3c9e36455b5d6447a9d6273a6e2a (patch) | |
tree | cc4e0c8d5d5c165f2eb88689339ef25b9f7deb3f /tools | |
parent | 4082e4711a1c54947429b15504caf778c6da22d0 (diff) | |
parent | 18205faa87abd85d0848291738821666928b5769 (diff) | |
download | Qt-d11e18b654de3c9e36455b5d6447a9d6273a6e2a.zip Qt-d11e18b654de3c9e36455b5d6447a9d6273a6e2a.tar.gz Qt-d11e18b654de3c9e36455b5d6447a9d6273a6e2a.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Move qmlvisualaids to another repo
Initial commit of qmlvisualaids
Allow testing of raster engine on Mac from qmlviewer
Don't leak QML compiled data objects
Add missing symbols to QtOpenGL arm def file
Add missing symbols to QtOpenGL emulator def file
Doc: clarify Flickable children vs. contentItem children.
Add a test on QWS
Fix parent bug for QDeclarativeOpenMetaObject
Add missing symbols in QtGui emulator def file
Diffstat (limited to 'tools')
-rw-r--r-- | tools/qml/main.cpp | 9 |
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") { |