QtGui: Bring back HBITMAP/HICON conversion functions.

- Move the conversion functions from the Lighthouse plugin
  to QtGui as qt_pixmap/From/To/HBITMAP/HICON().
- Re-enable them in Widgets (QFileIconProvider, QWindowsStyle).
- Use them in QtPrintSupport.

Change-Id: I1436bc604160d94c78ef270ad2b31bf3b20b5c90
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

1 files changed, 5 insertions, 3 deletions

diff --git a/src/plugins/platforms/windows/qwindowscursor.cpp b/src/plugins/platforms/windows/qwindowscursor.cpp
index 509a940d39..a3edd785d3 100644
--- a/src/plugins/platforms/windows/qwindowscursor.cpp
+++ b/src/plugins/platforms/windows/qwindowscursor.cpp
@@ -43,7 +43,6 @@
 #include "qwindowscontext.h"
 #include "qwindowswindow.h"
 #include "qwindowsscreen.h"
-#include "pixmaputils.h"
 
 #include <QtGui/QPixmap>
 #include <QtGui/QImage>
@@ -57,6 +56,9 @@
 
 QT_BEGIN_NAMESPACE
 
+Q_GUI_EXPORT HBITMAP qt_pixmapToWinHBITMAP(const QPixmap &p, int hbitmapFormat = 0);
+Q_GUI_EXPORT HBITMAP qt_createIconMask(const QBitmap &bitmap);
+
 /*!
     \class QWindowsCursor
     \brief Platform cursor implementation
@@ -84,8 +86,8 @@ HCURSOR QWindowsCursor::createPixmapCursor(const QPixmap &pixmap, int hotX, int
         mask.fill(Qt::color1);
     }
 
-    HBITMAP ic = qPixmapToWinHBITMAP(pixmap, HBitmapAlpha);
-    const HBITMAP im = createIconMask(mask);
+    HBITMAP ic = qt_pixmapToWinHBITMAP(pixmap, /* HBitmapAlpha */ 2);
+    const HBITMAP im = qt_createIconMask(mask);
 
     ICONINFO ii;
     ii.fIcon     = 0;