diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-03-13 10:19:21 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-13 14:55:53 +0100 |
| commit | bad1918cb438874e31dee05536e300c3470c7b23 (patch) | |
| tree | 95c7cb54a4c0237e249aece9871b143322508890 /src/plugins/platforms | |
| parent | 75614792fa2370b6b0402117bfef8efc364b7b67 (diff) | |
Fix build with Windows SDKs pre 7.0.
Check whether the IShellLibrary interface exists.
Task-number: QTBUG-29447
Change-Id: I93fc54a1e6d5c090f7c1768c756571ba57a7b2d2
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/plugins/platforms')
| -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 14bc26f770..0530707479 100644 --- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp +++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp @@ -1004,7 +1004,7 @@ void QWindowsNativeFileDialogBase::setMode(QFileDialogOptions::FileMode mode, QF qErrnoWarning("%s: SetOptions() failed", __FUNCTION__); } -#ifndef Q_OS_WINCE +#if !defined(Q_OS_WINCE) && defined(__IShellLibrary_INTERFACE_DEFINED__) // Windows SDK 7 // Helper for "Libraries": collections of folders appearing from Windows 7 // on, visible in the file dialogs. @@ -1057,7 +1057,7 @@ QString QWindowsNativeFileDialogBase::libraryItemDefaultSaveFolder(IShellItem *i return result; } -#else // !Q_OS_WINCE +#else // !Q_OS_WINCE && __IShellLibrary_INTERFACE_DEFINED__ QStringList QWindowsNativeFileDialogBase::libraryItemPaths(IShellItem *) { @@ -1069,7 +1069,7 @@ QString QWindowsNativeFileDialogBase::libraryDefaultSaveFolder(IShellItem *) return QString(); } -#endif // Q_OS_WINCE +#endif // Q_OS_WINCE || !__IShellLibrary_INTERFACE_DEFINED__ QString QWindowsNativeFileDialogBase::itemPath(IShellItem *item) { |