diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-30 01:00:14 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-30 01:00:14 +0200 |
| commit | 17f4d159a90d477dc0c7851e73a0a1cb6a86833e (patch) | |
| tree | 3396f91fc873a5996548cf99cba16fff0e8c7fdd /src/plugins/platforms | |
| parent | bff59f87ba11cac1dfa710f021522372de7a776f (diff) | |
| parent | ee6164942d21e7db5b5a6520cb0dbe1b9d631b21 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: If9cc79a7cc098104333821bc3b345f6890f01825
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/windows/qwin10helpers.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/qwin10helpers.cpp b/src/plugins/platforms/windows/qwin10helpers.cpp index ac6a34d7c2..5976fd23c0 100644 --- a/src/plugins/platforms/windows/qwin10helpers.cpp +++ b/src/plugins/platforms/windows/qwin10helpers.cpp @@ -43,7 +43,7 @@ #include <QtCore/QOperatingSystemVersion> #include <QtCore/private/qsystemlibrary_p.h> -#if defined(Q_CC_MINGW) +#if defined(Q_CC_MINGW) || defined(Q_CC_CLANG) # define HAS_UI_VIEW_SETTINGS_INTEROP // Present from MSVC2015 + SDK 10 onwards #elif (!defined(Q_CC_MSVC) || _MSC_VER >= 1900) && NTDDI_VERSION >= 0xa000000 |