From def35efe2a1e258d94791dc29ac36353deb0c03c Mon Sep 17 00:00:00 2001 From: Andreas Holzammer Date: Thu, 9 Feb 2012 17:43:42 +0100 Subject: [PATCH] Remove no longer needed ifdef Q_OS_WINCE. There is now an implementation to qt_pixmapFromWinHICON. So use it for Windows CE too. Change-Id: Ie2f3cacd4be9209e33d49e53703c5abc95d98d09 Reviewed-by: Friedemann Kleint --- src/widgets/itemviews/qfileiconprovider.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/widgets/itemviews/qfileiconprovider.cpp b/src/widgets/itemviews/qfileiconprovider.cpp index 6b5478b6ca..e90f78c801 100644 --- a/src/widgets/itemviews/qfileiconprovider.cpp +++ b/src/widgets/itemviews/qfileiconprovider.cpp @@ -288,11 +288,7 @@ QIcon QFileIconProviderPrivate::getWinIcon(const QFileInfo &fileInfo) const } } if (pixmap.isNull()) { -#ifndef Q_OS_WINCE pixmap = qt_pixmapFromWinHICON(info.hIcon); -#else - pixmap = QPixmap::fromWinHICON(ImageList_GetIcon((HIMAGELIST) val, info.iIcon, ILD_NORMAL)); -#endif if (!pixmap.isNull()) { retIcon.addPixmap(pixmap); if (!key.isEmpty()) @@ -318,11 +314,7 @@ QIcon QFileIconProviderPrivate::getWinIcon(const QFileInfo &fileInfo) const //using the unique icon index provided by windows save us from duplicate keys key = QString::fromLatin1("qt_dir_%1").arg(info.iIcon); } -#ifndef Q_OS_WINCE pixmap = qt_pixmapFromWinHICON(info.hIcon); -#else - pixmap = QPixmap::fromWinHICON(ImageList_GetIcon((HIMAGELIST) val, info.iIcon, ILD_NORMAL)); -#endif if (!pixmap.isNull()) { retIcon.addPixmap(pixmap); if (!key.isEmpty())