diff options
Diffstat (limited to 'src/gui/image/qpixmapdatafactory.cpp')
-rw-r--r-- | src/gui/image/qpixmapdatafactory.cpp | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/src/gui/image/qpixmapdatafactory.cpp b/src/gui/image/qpixmapdatafactory.cpp index f7c79880ca..ceb7a67064 100644 --- a/src/gui/image/qpixmapdatafactory.cpp +++ b/src/gui/image/qpixmapdatafactory.cpp @@ -60,8 +60,7 @@ # include <private/qpixmap_s60_p.h> #endif -#include "private/qapplication_p.h" -#include "private/qgraphicssystem_p.h" +#include "private/qguiapplication_p.h" QT_BEGIN_NAMESPACE @@ -76,22 +75,8 @@ public: QPixmapData* QSimplePixmapDataFactory::create(QPixmapData::PixelType type) { - if (QApplicationPrivate::graphicsSystem()) - return QApplicationPrivate::graphicsSystem()->createPixmapData(type); - -#if defined(Q_WS_X11) - return new QX11PixmapData(type); -#elif defined(Q_WS_WIN) - return new QRasterPixmapData(type); -#elif defined(Q_WS_MAC) - return new QMacPixmapData(type); -#elif defined(Q_WS_QPA) - return new QRasterPixmapData(type); -#elif defined(Q_OS_SYMBIAN) - return new QS60PixmapData(type); -#else -#error QSimplePixmapDataFactory::create() not implemented -#endif + // ### should we always use Raster instead? + return QGuiApplicationPrivate::platformIntegration()->createPixmapData(type); } Q_GLOBAL_STATIC(QSimplePixmapDataFactory, factory) |