diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2011-05-03 14:22:36 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@nokia.com> | 2011-05-03 14:23:39 +0200 |
commit | 075634945d5a9ba45fe7628c533977e6909f446d (patch) | |
tree | 62747ff9fd50bc2d17d99e5cd9b20c1adee03045 /src/gui/image/qpixmap.cpp | |
parent | 86f20c89af906ecd58a4da74f82bd895ec8392e8 (diff) |
remove the graphicssystem code paths.
QPA's platform integration layer replaces the
graphics system now.
Diffstat (limited to 'src/gui/image/qpixmap.cpp')
-rw-r--r-- | src/gui/image/qpixmap.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index ee16e1bb18..7c1779236d 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -54,7 +54,6 @@ #include "qbuffer.h" #include "qapplication.h" #include <private/qapplication_p.h> -#include <private/qgraphicssystem_p.h> #include <private/qwidget_p.h> #include "qevent.h" #include "qfile.h" @@ -1217,7 +1216,6 @@ QPixmap QPixmap::grabWidget(QWidget * widget, const QRect &rect) graphics system is explicitly enabled. \sa detach() - \sa QApplication::setGraphicsSystem() */ Qt::HANDLE QPixmap::handle() const @@ -1992,7 +1990,7 @@ int QPixmap::defaultDepth() #elif defined(Q_OS_SYMBIAN) return S60->screenDepth; #elif defined(Q_WS_QPA) - return 32; //LITE: use graphicssystem (we should do that in general) + return 32; //LITE: ### use graphicssystem (we should do that in general) #endif } @@ -2084,9 +2082,7 @@ QPixmap QPixmap::fromImage(const QImage &image, Qt::ImageConversionFlags flags) if (image.isNull()) return QPixmap(); - QGraphicsSystem* gs = QApplicationPrivate::graphicsSystem(); - QScopedPointer<QPixmapData> data(gs ? gs->createPixmapData(QPixmapData::PixmapType) - : QGraphicsSystem::createDefaultPixmapData(QPixmapData::PixmapType)); + QScopedPointer<QPixmapData> data(QGuiApplicationPrivate::platformIntegration()->createPixmapData(QPixmapData::PixmapType)); data->fromImage(image, flags); return QPixmap(data.take()); } @@ -2105,9 +2101,7 @@ QPixmap QPixmap::fromImage(const QImage &image, Qt::ImageConversionFlags flags) */ QPixmap QPixmap::fromImageReader(QImageReader *imageReader, Qt::ImageConversionFlags flags) { - QGraphicsSystem *gs = QApplicationPrivate::graphicsSystem(); - QScopedPointer<QPixmapData> data(gs ? gs->createPixmapData(QPixmapData::PixmapType) - : QGraphicsSystem::createDefaultPixmapData(QPixmapData::PixmapType)); + QScopedPointer<QPixmapData> data(QGuiApplicationPrivate::platformIntegration()->createPixmapData(QPixmapData::PixmapType)); data->fromImageReader(imageReader, flags); return QPixmap(data.take()); } |