diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-11-28 14:33:54 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-28 16:57:58 +0100 |
| commit | b8d330904b279de57d70caef70ab2d2a6770f0cc (patch) | |
| tree | a9edf91fa9b80142bdcdf2912b2701704bf7ca6c /src/gui/image/image.pri | |
| parent | f6c107d799d14bbdb2cb71b8446483541bb0adb5 (diff) | |
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>
Diffstat (limited to 'src/gui/image/image.pri')
| -rw-r--r-- | src/gui/image/image.pri | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri index ba200bf68c..b8eb546ba5 100644 --- a/src/gui/image/image.pri +++ b/src/gui/image/image.pri @@ -46,6 +46,7 @@ SOURCES += \ image/qvolatileimage.cpp SOURCES += image/qpixmap_qpa.cpp +win32: SOURCES += image/qpixmap_win.cpp !symbian|contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2) { SOURCES += image/qvolatileimagedata.cpp |