diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-12-05 13:32:35 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-12-05 13:37:21 +0100 |
| commit | 53b141dcebc2ca423dbc31e5b6321a769155e9a4 (patch) | |
| tree | e62c7d9875acab8094d64d137c90e7e5f53c0893 /src/3rdparty | |
| parent | 2c6c044500a92a3a125ce4b5d936992bdf02a487 (diff) | |
| parent | 6508fdca1dcc7105947befadba272d0fd4bbc27f (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/plugins/platforms/ios/quiview.mm
Change-Id: I88384c70047391c75d9ff166c8d9881ff6751dbf
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp b/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp index 0173311bc6..5118bdbe9c 100644 --- a/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp +++ b/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp @@ -2645,7 +2645,7 @@ bool Renderer11::getShareHandleSupport() const if (deviceType == d3d11::ANGLE_D3D11_DEVICE_TYPE_WARP) { -#if !defined(ANGLE_ENABLE_WINDOWS_STORE) && !defined(__GNUC__) +#ifndef ANGLE_ENABLE_WINDOWS_STORE if (!IsWindows8OrGreater()) { // WARP on Windows 7 doesn't support shared handles |