projects
/
profile
/
ivi
/
qtbase.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
61ebcc3
)
Do not override CO_E_NOT_SUPPORTED
author
kb
<k.blammo@gmail.com>
Sun, 13 May 2012 21:01:00 +0000
(23:01 +0200)
committer
Qt by Nokia
<qt-info@nokia.com>
Mon, 14 May 2012 19:33:58 +0000
(21:33 +0200)
Change-Id: Id0cb9e1dca67400a2e3a02da663d810b06bdb6ec
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
src/plugins/platforms/windows/qtwindows_additional.h
patch
|
blob
|
history
diff --git
a/src/plugins/platforms/windows/qtwindows_additional.h
b/src/plugins/platforms/windows/qtwindows_additional.h
index
3465d4a
..
3c7211c
100644
(file)
--- 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