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>

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;
 }

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"

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 \

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"

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 \