projects / profile / ivi / qtbase.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 507b90a)
ItemViews: Fix MinGW compiler warning
authorKai Koehne <kai.koehne@digia.com>
Thu, 27 Sep 2012 08:23:02 +0000 (10:23 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 27 Sep 2012 12:59:13 +0000 (14:59 +0200)
Fix compiler 'warning: "_WIN32_IE" redefined'

Change-Id: I70ada35027a2bab0a6c4f84dd1384028d2afbcc9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
src/widgets/itemviews/qfileiconprovider.cpp patch | blob | history

diff --git a/src/widgets/itemviews/qfileiconprovider.cpp b/src/widgets/itemviews/qfileiconprovider.cpp
index 408d095..99a7c1c 100644 (file)
--- a/src/widgets/itemviews/qfileiconprovider.cpp
+++ b/src/widgets/itemviews/qfileiconprovider.cpp
@@ -52,6 +52,9 @@
 #include <qpa/qplatformservices.h>
 
 #if defined(Q_OS_WIN)
+#if defined(_WIN32_IE)
+#  undef _WIN32_IE
+#endif
 #  define _WIN32_IE 0x0500
 #  include <qt_windows.h>
 #  include <commctrl.h>
Domain: UI Framework / Uncategorized;