diff options
| author | Pulse Build System <qt-info@nokia.com> | 2010-01-22 16:04:18 (GMT) |
|---|---|---|
| committer | Pulse Build System <qt-info@nokia.com> | 2010-01-22 16:04:18 (GMT) |
| commit | 735c195d2a8759718e1a82976ef649b0858b6413 (patch) | |
| tree | 5c29ea9e4fb47d1d6131724fc72b361605c31688 /src/gui/dialogs | |
| parent | 08ff927d675532e4b8b9fef616194dfd0200b7c7 (diff) | |
| parent | 5b435197b777e4cf92608407c16c4bfc95d089b9 (diff) | |
| download | Qt-735c195d2a8759718e1a82976ef649b0858b6413.zip Qt-735c195d2a8759718e1a82976ef649b0858b6413.tar.gz Qt-735c195d2a8759718e1a82976ef649b0858b6413.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed compile for wincewm60standard-msvc2008 (attempt 2)
Fixed compile for wincewm60standard-msvc2008.
Fixed compile.
Fixed compile for wincewm60standard-msvc2008.
Fixed compile when Qt is configured with -no-webkit
build fix for mingw
Build fix for MSVC2005 and older SDK
QStyleSheetStyle: Fixed some text croped when having padding with native border.
Remove obsolete code for unsupported platforms
Character spacing when drawing a QPicture to a high DPI device.
Diffstat (limited to 'src/gui/dialogs')
| -rw-r--r-- | src/gui/dialogs/qfiledialog_win.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/dialogs/qfiledialog_win.cpp b/src/gui/dialogs/qfiledialog_win.cpp index 3bfeb03..c7cef1e 100644 --- a/src/gui/dialogs/qfiledialog_win.cpp +++ b/src/gui/dialogs/qfiledialog_win.cpp @@ -60,6 +60,7 @@ #endif #ifdef Q_WS_WINCE +#include <shlobj.h> #include <commdlg.h> bool qt_priv_ptr_valid = false; #else |