diff options
| author | Jonathan Liu <net147@gmail.com> | 2012-07-01 16:19:59 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-02 10:06:11 +0200 |
| commit | f58390e0f495e229d9f2f1301c3a9dec978af9c2 (patch) | |
| tree | d136886db13f51c2a44de778bf262834aa8e823c /src/plugins | |
| parent | 34396358d536289868b1d89aafb854e2955afcf4 (diff) | |
Fix MinGW-w64 compilation
Task-number: QTBUG-24699
Change-Id: If6210315926f0266045766bb5d3b00a6d0bdf703
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsdialoghelpers.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp index a02ee85cc8..0fe6109f0d 100644 --- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp +++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp @@ -70,7 +70,7 @@ // #define USE_NATIVE_COLOR_DIALOG /* Testing purposes only */ -#ifdef Q_CC_MINGW /* Add missing declarations for MinGW */ +#if defined(Q_CC_MINGW) && __MINGW64_VERSION_MAJOR < 3 /* Add missing declarations for MinGW */ /* Constants obtained by running the below stream operator for * CLSID, IID on the constants in the Windows SDK libraries. */ @@ -116,7 +116,7 @@ typedef struct _COMDLG_FILTERSPEC #define FOS_DEFAULTNOMINIMODE 0x20000000 #define FOS_FORCEPREVIEWPANEON 0x40000000 -#if !defined(__MINGW64_VERSION_MAJOR) || (__MINGW64_VERSION_MAJOR < 2) +#if __MINGW64_VERSION_MAJOR < 2 typedef int GETPROPERTYSTOREFLAGS; #define GPS_DEFAULT 0x00000000 #define GPS_HANDLERPROPERTIESONLY 0x00000001 @@ -305,7 +305,7 @@ public: STDMETHOD(ApplyProperties)(THIS_ IShellItem *psi, IPropertyStore *pStore, HWND hwnd, IFileOperationProgressSink *pSink) PURE; }; -#endif // Q_CC_MINGW +#endif // defined(Q_CC_MINGW) && __MINGW64_VERSION_MAJOR < 3 QT_BEGIN_NAMESPACE |