diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-05-18 01:37:51 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-05-18 01:37:51 (GMT) |
| commit | ee41cb13e986d28fb32040093d7797f2bcd6ca78 (patch) | |
| tree | 569518c011c5655beb007ebd930a3f8fb27f9b41 /tools | |
| parent | 4fa070d69c84de373eeed79aea569d408757cd52 (diff) | |
| parent | 273024e58d90bb9b3a5da0161f884f1af22d75df (diff) | |
| download | Qt-ee41cb13e986d28fb32040093d7797f2bcd6ca78.zip Qt-ee41cb13e986d28fb32040093d7797f2bcd6ca78.tar.gz Qt-ee41cb13e986d28fb32040093d7797f2bcd6ca78.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qml/main.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp index 0b3f2f0..18e2531 100644 --- a/tools/qml/main.cpp +++ b/tools/qml/main.cpp @@ -180,7 +180,7 @@ int main(int argc, char ** argv) atexit(showWarnings); #endif -#if defined (Q_WS_X11) +#if defined (Q_WS_X11) || defined (Q_WS_MAC) //### default to using raster graphics backend for now bool gsSpecified = false; for (int i = 0; i < argc; ++i) { @@ -234,6 +234,10 @@ int main(int argc, char ** argv) useNativeFileBrowser = false; #endif +#if defined(Q_WS_MAC) + useGL = true; +#endif + for (int i = 1; i < argc; ++i) { bool lastArg = (i == argc - 1); QString arg = argv[i]; |