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/plugins/platforms/windows/windows.pro | |
| 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/plugins/platforms/windows/windows.pro')
| -rw-r--r-- | src/plugins/platforms/windows/windows.pro | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro index 33ca07d134..4b7202578a 100644 --- a/src/plugins/platforms/windows/windows.pro +++ b/src/plugins/platforms/windows/windows.pro @@ -43,7 +43,6 @@ SOURCES += \ qwindowsmime.cpp \ qwindowsdrag.cpp \ qwindowscursor.cpp \ - pixmaputils.cpp \ qwindowsinputcontext.cpp \ qwindowsaccessibility.cpp \ qwindowstheme.cpp \ @@ -70,7 +69,6 @@ HEADERS += \ qwindowsdrag.h \ qwindowsinternalmimedata.h \ qwindowscursor.h \ - pixmaputils.h \ array.h \ qwindowsinputcontext.h \ qwindowsaccessibility.h \ |