diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:12:21 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:12:35 +0200 |
| commit | d0eb444a49f6064ecb896f62276e060cd8a4b1e8 (patch) | |
| tree | 34d8dd637baf665225ada73e76604531cd2c75e5 /src/plugins/platforms/windows | |
| parent | da0cb32b8ee7cc4a991a59420a411898e63a660e (diff) | |
| parent | 894f86709080fe8d20875b402adce679963c49c2 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ib8cfeee7d9ca15e8ad520e428b72c200827a8628
Diffstat (limited to 'src/plugins/platforms/windows')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsdialoghelpers.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsmime.cpp | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp index 4add6cd634..0ecbf44194 100644 --- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp +++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp @@ -41,6 +41,8 @@ #define QT_NO_URL_CAST_FROM_STRING 1 +#define _WIN32_WINNT 0x0600 + #include "qwindowsdialoghelpers.h" #include "qwindowscontext.h" @@ -236,7 +238,7 @@ DECLARE_INTERFACE_(IShellItemFilter, IUnknown) }; #endif -#ifndef __IShellEnumItems_INTERFACE_DEFINED__ +#ifndef __IEnumShellItems_INTERFACE_DEFINED__ DECLARE_INTERFACE_(IEnumShellItems, IUnknown) { STDMETHOD(Next)(THIS_ ULONG celt, IShellItem **rgelt, ULONG *pceltFetched) PURE; diff --git a/src/plugins/platforms/windows/qwindowsmime.cpp b/src/plugins/platforms/windows/qwindowsmime.cpp index c1d75c2ad0..f62b8a6139 100644 --- a/src/plugins/platforms/windows/qwindowsmime.cpp +++ b/src/plugins/platforms/windows/qwindowsmime.cpp @@ -469,7 +469,7 @@ int QWindowsMime::registerMimeType(const QString &mime) /*! \fn bool QWindowsMime::canConvertFromMime(const FORMATETC &formatetc, const QMimeData *mimeData) const - Returns true if the converter can convert from the \a mimeData to + Returns \c true if the converter can convert from the \a mimeData to the format specified in \a formatetc. All subclasses must reimplement this pure virtual function. @@ -478,7 +478,7 @@ int QWindowsMime::registerMimeType(const QString &mime) /*! \fn bool QWindowsMime::canConvertToMime(const QString &mimeType, IDataObject *pDataObj) const - Returns true if the converter can convert to the \a mimeType from + Returns \c true if the converter can convert to the \a mimeType from the available formats in \a pDataObj. All subclasses must reimplement this pure virtual function. |