QtGui: Bring back HBITMAP/HICON conversion functions.
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>
Mon, 28 Nov 2011 13:33:54 +0000 (14:33 +0100)
committerQt by Nokia <qt-info@nokia.com>
Mon, 28 Nov 2011 15:57:58 +0000 (16:57 +0100)
commitb8d330904b279de57d70caef70ab2d2a6770f0cc
treea9edf91fa9b80142bdcdf2912b2701704bf7ca6c
parentf6c107d799d14bbdb2cb71b8446483541bb0adb5
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>
src/gui/image/image.pri
src/gui/image/qpixmap_win.cpp [moved from src/plugins/platforms/windows/pixmaputils.cpp with 88% similarity]
src/plugins/platforms/windows/pixmaputils.h [deleted file]
src/plugins/platforms/windows/qwindowscursor.cpp
src/plugins/platforms/windows/qwindowsscreen.cpp
src/plugins/platforms/windows/windows.pro
src/printsupport/kernel/qprintengine_win.cpp
src/widgets/dialogs/qwizard_win.cpp
src/widgets/itemviews/qfileiconprovider.cpp
src/widgets/kernel/win.pri
src/widgets/styles/qwindowsstyle.cpp