diff options
| author | Andrew Knight <andrew.knight@digia.com> | 2014-01-13 09:22:14 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-13 13:24:13 +0100 |
| commit | 5f56af8c89845ba6d7a0a4e790b28d3a74581681 (patch) | |
| tree | f92adefc4ddde1ffac4ac1dd17d1c360f696b58c | |
| parent | dc9b194f6b4da0b4c29b83224bb3af9635be1773 (diff) | |
Compile fix for Windows Phone
Shlobj.h should not be included on Windows Phone. As it isn't needed
for WinRT in general here, exclude it.
Change-Id: I1eaa50ab8825d2f43d59272c841673c3e9e1e12a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| -rw-r--r-- | src/corelib/io/qsettings.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index db4612ae33..043af9635e 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -78,7 +78,9 @@ #ifdef Q_OS_WIN // for homedirpath reading from registry # include <private/qsystemlibrary_p.h> # include <qt_windows.h> -# include <shlobj.h> +# ifndef Q_OS_WINRT +# include <shlobj.h> +# endif #endif #ifdef Q_OS_WINRT |