summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkb <k.blammo@gmail.com>2012-05-13 23:01:00 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-14 21:33:58 +0200
commit9bd24b6edc7c15dffe382e226c782b394b40c632 (patch)
treee80299e1131485eb354821fc30cd626c8f4b7968
parent61ebcc3ae7f232907f59b39c7edbd21559d6d9b6 (diff)
Do not override CO_E_NOT_SUPPORTED
Change-Id: Id0cb9e1dca67400a2e3a02da663d810b06bdb6ec Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
-rw-r--r--src/plugins/platforms/windows/qtwindows_additional.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/windows/qtwindows_additional.h b/src/plugins/platforms/windows/qtwindows_additional.h
index 3465d4ab1e..3c7211cb71 100644
--- a/src/plugins/platforms/windows/qtwindows_additional.h
+++ b/src/plugins/platforms/windows/qtwindows_additional.h
@@ -65,7 +65,9 @@
# define COLOR_MENUBAR 30
# define CF_DIBV5 17
+#if !defined(CO_E_NOT_SUPPORTED)
#define CO_E_NOT_SUPPORTED _HRESULT_TYPEDEF_(0x80004021L)
+#endif
#define IFMETHOD HRESULT STDMETHODCALLTYPE
#define IFACEMETHODIMP STDMETHODIMP