summaryrefslogtreecommitdiffstats
path: root/src/gui/painting
diff options
context:
space:
mode:
authorFabien Freling <fabien.freling@nokia.com>2011-04-18 11:49:57 +0200
committerFabien Freling <fabien.freling@nokia.com>2011-05-10 11:44:57 +0200
commit8ac73771c660939573cb9d53f8636994f46e5c17 (patch)
tree89a879081082ce39d524b6a88e995ce8b65dc12c /src/gui/painting
parent5edb03f8554ee05785c2a98c0c522586f49d7edd (diff)
Revert "Switch the default graphics system to raster on Mac."
This reverts commit a5d40fd3814ab7c8e865912c03a918bfd5994998. We have to fix the regressions due to the raster engine before putting it by default. (cherry picked from commit 3197fe2af911673c6291db0102e90a0d7f6ae926)
Diffstat (limited to 'src/gui/painting')
-rw-r--r--src/gui/painting/qgraphicssystemfactory.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qgraphicssystemfactory.cpp b/src/gui/painting/qgraphicssystemfactory.cpp
index 6212674c77..62a60d77c0 100644
--- a/src/gui/painting/qgraphicssystemfactory.cpp
+++ b/src/gui/painting/qgraphicssystemfactory.cpp
@@ -74,7 +74,7 @@ QGraphicsSystem *QGraphicsSystemFactory::create(const QString& key)
if (system.isEmpty()) {
system = QLatin1String("runtime");
}
-#elif defined (QT_GRAPHICSSYSTEM_RASTER) && !defined(Q_WS_WIN) && !defined(Q_OS_SYMBIAN) || defined(Q_WS_X11) || (defined (Q_WS_MAC) && defined(QT_MAC_USE_COCOA))
+#elif defined (QT_GRAPHICSSYSTEM_RASTER) && !defined(Q_WS_WIN) && !defined(Q_OS_SYMBIAN) || defined(Q_WS_X11)
if (system.isEmpty()) {
system = QLatin1String("raster");
}