summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2010-05-17 23:06:47 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2010-05-18 00:47:10 (GMT)
commit4530e4c8cf1ddb1ac92fc04fa5d25b0b78308534 (patch)
tree20101d21b22a3e2363f4c06afd25c2aafccbce68 /tools
parent1db36a5a37dcca0e24ada3c852f2647ab2330eee (diff)
downloadQt-4530e4c8cf1ddb1ac92fc04fa5d25b0b78308534.zip
Qt-4530e4c8cf1ddb1ac92fc04fa5d25b0b78308534.tar.gz
Qt-4530e4c8cf1ddb1ac92fc04fa5d25b0b78308534.tar.bz2
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
Diffstat (limited to 'tools')
-rw-r--r--tools/qml/main.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 380f5cc..0ddce72 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];