diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-11-30 10:07:43 +0100 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2016-11-30 12:51:38 +0000 |
| commit | 448790eaedff47c8a8df9da964b988e309c06182 (patch) | |
| tree | 434a565a15234d5eea1863ab33aaa576eb0f407a /src/plugins/platforms | |
| parent | 6515d942aef76d7090e2421b85ac58eeae3614ea (diff) | |
Windows QPA: Fix build with MSVC2015 on Windows 7
The installation uses SDK 8.1 which does not have the required
include files. Add a check depending on NTDDI_VERSION.
Change-Id: I6323496aed2a2d6e22d41ec14bdf8c6cf1bf2f31
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/windows/qwin10helpers.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/qwin10helpers.cpp b/src/plugins/platforms/windows/qwin10helpers.cpp index 3ded96b9d6..977bbfd11b 100644 --- a/src/plugins/platforms/windows/qwin10helpers.cpp +++ b/src/plugins/platforms/windows/qwin10helpers.cpp @@ -44,7 +44,8 @@ #if defined(Q_CC_MINGW) # define HAS_UI_VIEW_SETTINGS_INTEROP -#elif !defined(Q_CC_MSVC) || _MSC_VER >= 1900 // MSVC2013 is lacking both +// Present from MSVC2015 + SDK 10 onwards +#elif (!defined(Q_CC_MSVC) || _MSC_VER >= 1900) && NTDDI_VERSION >= 0xa000000 # define HAS_UI_VIEW_SETTINGS_INTEROP # define HAS_UI_VIEW_SETTINGS #endif |