From 4530e4c8cf1ddb1ac92fc04fa5d25b0b78308534 Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Tue, 18 May 2010 09:06:47 +1000
Subject: Set raster + gl viewport as the default for OS X.

This setup seems to work around most rendering bugs and timing issues.

Task-number: QTBUG-10544
---
 tools/qml/main.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 380f5cc2b6..0ddce725ea 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -181,7 +181,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) {
@@ -236,6 +236,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];
-- 
cgit v1.2.3