diff options
| author | Andreas Holzammer <andreas.holzammer@kdab.com> | 2012-02-09 17:43:42 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-10 08:21:51 +0100 |
| commit | def35efe2a1e258d94791dc29ac36353deb0c03c (patch) | |
| tree | ad4e1aeb110e05efa28cf9f52a7220ef7e9bbd12 /src/widgets/itemviews/qfileiconprovider.cpp | |
| parent | 84607219c0e1e01a82132af9172e350529c3eb38 (diff) | |
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 <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/widgets/itemviews/qfileiconprovider.cpp')
| -rw-r--r-- | src/widgets/itemviews/qfileiconprovider.cpp | 8 |
1 files changed, 0 insertions, 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()) |