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 | |
| 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>
| -rw-r--r-- | src/gui/image/qnativeimage.cpp | 4 | ||||
| -rw-r--r-- | src/gui/image/qpixmap.cpp | 1 | ||||
| -rw-r--r-- | src/gui/painting/painting.pri | 1 | ||||
| -rw-r--r-- | src/gui/painting/qcolor.cpp | 1 | ||||
| -rw-r--r-- | src/widgets/util/qcolormap.h (renamed from src/gui/painting/qcolormap.h) | 0 | ||||
| -rw-r--r-- | src/widgets/util/qcolormap.qdoc (renamed from src/gui/painting/qcolormap.qdoc) | 0 | ||||
| -rw-r--r-- | src/widgets/util/qcolormap_qpa.cpp (renamed from src/gui/painting/qcolormap_qpa.cpp) | 0 | ||||
| -rw-r--r-- | src/widgets/util/util.pri | 2 |
8 files changed, 4 insertions, 5 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" diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri index dfc1f88d6d..1d359ca88c 100644 --- a/src/gui/painting/painting.pri +++ b/src/gui/painting/painting.pri @@ -6,7 +6,6 @@ HEADERS += \ painting/qbrush.h \ painting/qcolor.h \ painting/qcolor_p.h \ - painting/qcolormap.h \ painting/qcosmeticstroker_p.h \ painting/qemulationpaintengine_p.h \ painting/qmatrix.h \ diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp index 5235cb9013..93492ab134 100644 --- a/src/gui/painting/qcolor.cpp +++ b/src/gui/painting/qcolor.cpp @@ -42,7 +42,6 @@ #include "qcolor.h" #include "qcolor_p.h" #include "qnamespace.h" -#include "qcolormap.h" #include "qdatastream.h" #include "qvariant.h" #include "qdebug.h" diff --git a/src/gui/painting/qcolormap.h b/src/widgets/util/qcolormap.h index 7ac818fc2e..7ac818fc2e 100644 --- a/src/gui/painting/qcolormap.h +++ b/src/widgets/util/qcolormap.h diff --git a/src/gui/painting/qcolormap.qdoc b/src/widgets/util/qcolormap.qdoc index 99b97a54b4..99b97a54b4 100644 --- a/src/gui/painting/qcolormap.qdoc +++ b/src/widgets/util/qcolormap.qdoc diff --git a/src/gui/painting/qcolormap_qpa.cpp b/src/widgets/util/qcolormap_qpa.cpp index 6ad3abb3aa..6ad3abb3aa 100644 --- a/src/gui/painting/qcolormap_qpa.cpp +++ b/src/widgets/util/qcolormap_qpa.cpp diff --git a/src/widgets/util/util.pri b/src/widgets/util/util.pri index 1ba8011ee3..2eec946338 100644 --- a/src/widgets/util/util.pri +++ b/src/widgets/util/util.pri @@ -2,6 +2,7 @@ HEADERS += \ util/qsystemtrayicon.h \ + util/qcolormap.h \ util/qcompleter.h \ util/qcompleter_p.h \ util/qsystemtrayicon_p.h \ @@ -17,6 +18,7 @@ HEADERS += \ SOURCES += \ util/qsystemtrayicon.cpp \ + util/qcolormap_qpa.cpp \ util/qcompleter.cpp \ util/qscroller.cpp \ util/qscrollerproperties.cpp \ |