summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjoern Breitmeyer <bjoern.breitmeyer@kdab.com>2012-05-04 14:06:42 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-04 15:24:52 +0200
commit55024ee0f9150eef30fcdb4c8b74d7083022f472 (patch)
tree7c0e42ff82c357c9e3ad875e0b8c9d1b0fd862b7
parent55b5cb9caa7ef79bef1ba5291377134921c03d41 (diff)
removed unneccessary wince ifdef
Change-Id: I4b057c0ae266baae3e8c3675656abb361bfcacf4 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
-rw-r--r--src/gui/image/qpixmap_win.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/image/qpixmap_win.cpp b/src/gui/image/qpixmap_win.cpp
index 227e70e1a6..66a829f5de 100644
--- a/src/gui/image/qpixmap_win.cpp
+++ b/src/gui/image/qpixmap_win.cpp
@@ -211,7 +211,6 @@ Q_GUI_EXPORT HBITMAP qt_pixmapToWinHBITMAP(const QPixmap &p, int hbitmapFormat =
return bitmap;
}
-#ifndef Q_OS_WINCE
Q_GUI_EXPORT QPixmap qt_pixmapFromWinHBITMAP(HBITMAP bitmap, int hbitmapFormat = 0)
{
@@ -276,7 +275,6 @@ Q_GUI_EXPORT QPixmap qt_pixmapFromWinHBITMAP(HBITMAP bitmap, int hbitmapFormat =
return QPixmap::fromImage(image);
}
-#endif //ifndef Q_OS_WINCE
Q_GUI_EXPORT HICON qt_pixmapToWinHICON(const QPixmap &p)
{