diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2011-05-03 10:35:49 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@nokia.com> | 2011-05-03 13:16:52 +0200 |
commit | 806e02604399924393fd4c75924de04e5d2aa7aa (patch) | |
tree | 2979a5cd00fa3dd3499331a53caf94a8e9f63da6 /src/gui | |
parent | eba9bad43145a00529bdf7e5becfbb063e50c673 (diff) |
remove qapp dependency
graphicssystems are not relevant in any case with qpa, so
we simply use the fallback case.
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/image/qbitmap.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/gui/image/qbitmap.cpp b/src/gui/image/qbitmap.cpp index 260b397140..a405268818 100644 --- a/src/gui/image/qbitmap.cpp +++ b/src/gui/image/qbitmap.cpp @@ -45,7 +45,6 @@ #include "qvariant.h" #include <qpainter.h> #include <private/qgraphicssystem_p.h> -#include <private/qapplication_p.h> QT_BEGIN_NAMESPACE @@ -275,9 +274,7 @@ QBitmap QBitmap::fromImage(const QImage &image, Qt::ImageConversionFlags flags) img.setColor(1, c0); } - QGraphicsSystem* gs = QApplicationPrivate::graphicsSystem(); - QScopedPointer<QPixmapData> data(gs ? gs->createPixmapData(QPixmapData::BitmapType) - : QGraphicsSystem::createDefaultPixmapData(QPixmapData::BitmapType)); + QScopedPointer<QPixmapData> data(QGraphicsSystem::createDefaultPixmapData(QPixmapData::BitmapType)); data->fromImage(img, flags | Qt::MonoOnly); return QPixmap(data.take()); |