summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@nokia.com>2009-08-11 14:06:57 (GMT)
committerThomas Hartmann <Thomas.Hartmann@nokia.com>2009-08-11 14:06:57 (GMT)
commit37af08ae61715fc7877f71080b652ef5fc7820f0 (patch)
tree5b14857615161793ebfbd3f1109b33e1177d0e7b
parentca28af7c530e60f55556aa7efc6fe19660be53b1 (diff)
parentceadb04b5c4d676f272194bd524c1a20e60dee24 (diff)
downloadQt-37af08ae61715fc7877f71080b652ef5fc7820f0.zip
Qt-37af08ae61715fc7877f71080b652ef5fc7820f0.tar.gz
Qt-37af08ae61715fc7877f71080b652ef5fc7820f0.tar.bz2
Merge commit 'remotes/wm65/wm65'
Conflicts: src/gui/dialogs/qfiledialog_win.cpp
-rw-r--r--src/gui/dialogs/qfiledialog_win.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/dialogs/qfiledialog_win.cpp b/src/gui/dialogs/qfiledialog_win.cpp
index 114456d..ce229e0 100644
--- a/src/gui/dialogs/qfiledialog_win.cpp
+++ b/src/gui/dialogs/qfiledialog_win.cpp
@@ -63,6 +63,7 @@
#if !defined(Q_WS_WINCE) && !defined(Q_CC_MINGW)
#include <shobjidl.h>
#endif
+
#include <objbase.h>
#if defined(__IFileDialog_INTERFACE_DEFINED__) \