diff options
author | Jonathan Liu <net147@gmail.com> | 2012-09-01 16:13:25 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-03 11:05:49 +0200 |
commit | 6960fb2f6e7d338d16ad883a6feea0da448c76c1 (patch) | |
tree | 3aab31a13e71bdeea16595bf4b5a5d8bad534561 /src/plugins | |
parent | 8cba00ebf55090d717e41c14f5f1044faac578a7 (diff) |
Fix MinGW-w64 GCC 4.6.3 compilation
Several IShellLibrary constants and the COMDLG_FILTERSPEC struct are
already defined in newer versions of the MinGW-w64 headers.
Change-Id: I614b35c835123484aeeb4e61e0bae24261584da0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/platforms/windows/qwindowsdialoghelpers.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp index c586ecb21b..5f424f7e3c 100644 --- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp +++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp @@ -72,6 +72,8 @@ #ifdef Q_CC_MINGW /* Add missing declarations for MinGW */ +#ifndef __IShellLibrary_FWD_DEFINED__ + /* Constants obtained by running the below stream operator for * CLSID, IID on the constants in the Windows SDK libraries. */ @@ -87,8 +89,6 @@ static const IID IID_IFileDialogEvents = {0x973510db, 0x7d7f, 0x452b,{0x89, 0x static const CLSID CLSID_FileOpenDialog = {0xdc1c5a9c, 0xe88a, 0x4dde, {0xa5, 0xa1, 0x60, 0xf8, 0x2a, 0x20, 0xae, 0xf7}}; static const CLSID CLSID_FileSaveDialog = {0xc0b4e2f3, 0xba21, 0x4773,{0x8d, 0xba, 0x33, 0x5e, 0xc9, 0x46, 0xeb, 0x8b}}; -#ifndef __IShellLibrary_FWD_DEFINED__ - typedef struct _COMDLG_FILTERSPEC { LPCWSTR pszName; |