diff options
| author | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2011-06-28 09:47:03 (GMT) |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2011-06-28 09:47:03 (GMT) |
| commit | fd460a23cbfeaaefb6c870987206de373bfab826 (patch) | |
| tree | e81cba9e255f4a1b71426bf5f90a5bf63058aca1 /src/gui/painting | |
| parent | b64b3193a39dc52c520fa74a268f068072468473 (diff) | |
| parent | 04b98a8737ecf8629fa15823495f9756a2f0eb0e (diff) | |
| download | Qt-fd460a23cbfeaaefb6c870987206de373bfab826.zip Qt-fd460a23cbfeaaefb6c870987206de373bfab826.tar.gz Qt-fd460a23cbfeaaefb6c870987206de373bfab826.tar.bz2 | |
Merge branch '4.8'
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 4309140..01ece09 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"); } |