diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-08-16 14:47:43 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-08-19 09:15:04 +0200 |
| commit | 9ed282eeee0f761fcd4d77777098b10e61eec2f0 (patch) | |
| tree | a6fc227b085a3fdb93e6336591a1f422a692abd9 /src/gui/image | |
| parent | 0b8d0804219b7e2e6179112d663b989d5b749d17 (diff) | |
Move QColorMap into QtWidgets
Remove the remaining dependency in qnativeimage
and move the whole class into QtGui for compatibility.
The class is not needed anymore since we're not going
to support 8bit/indexed displays going forward.
Change-Id: I7b5f1b2a5661db4ed77bb3801039114c7518512d
Reviewed-on: http://codereview.qt.nokia.com/3199
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qnativeimage.cpp | 4 | ||||
| -rw-r--r-- | src/gui/image/qpixmap.cpp | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp index d0f6c4c7d6..35bca4431d 100644 --- a/src/gui/image/qnativeimage.cpp +++ b/src/gui/image/qnativeimage.cpp @@ -41,7 +41,7 @@ #include <qdebug.h> #include "qnativeimage_p.h" -#include "qcolormap.h" +#include "private/qguiapplication_p.h" #include "qscreen.h" #include "private/qpaintengine_raster_p.h" @@ -141,7 +141,7 @@ QNativeImage::~QNativeImage() QImage::Format QNativeImage::systemFormat() { - if (QColormap::instance().depth() == 16) + if (QGuiApplication::primaryScreen()->depth() == 16) return QImage::Format_RGB16; return QImage::Format_RGB32; } diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index d02da27f4e..c7306ad6a2 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -46,7 +46,6 @@ #include "qimagepixmapcleanuphooks_p.h" #include "qbitmap.h" -#include "qcolormap.h" #include "qimage.h" #include "qpainter.h" #include "qdatastream.h" |