diff options
| author | Fabien Freling <fabien.freling@nokia.com> | 2011-05-04 11:58:23 (GMT) |
|---|---|---|
| committer | Fabien Freling <fabien.freling@nokia.com> | 2011-05-04 11:58:23 (GMT) |
| commit | 4ff06543edc10ce77458d6aa66b2faf1a2c96a91 (patch) | |
| tree | 5d28d26107380eaaebd6f926f22936098d25a792 /src/gui/painting | |
| parent | 5aa5c2e2935c1829cc6965198968699f17c24ec0 (diff) | |
| parent | 2c6af885d959f90b801c74dc5d389a720dc9fd1d (diff) | |
| download | Qt-4ff06543edc10ce77458d6aa66b2faf1a2c96a91.zip Qt-4ff06543edc10ce77458d6aa66b2faf1a2c96a91.tar.gz Qt-4ff06543edc10ce77458d6aa66b2faf1a2c96a91.tar.bz2 | |
Merge branch 'master' into merge_raster
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qgraphicssystemfactory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qgraphicssystemfactory.cpp b/src/gui/painting/qgraphicssystemfactory.cpp index 62a60d7..6212674 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) +#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)) if (system.isEmpty()) { system = QLatin1String("raster"); } |