diff options
author | Liang Qi <liang.qi@qt.io> | 2016-10-31 09:26:35 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-10-31 09:26:35 +0100 |
commit | 8e20daae9fee5f3b999daffce0d7156015ee974b (patch) | |
tree | 7adcc397fd378cbb97c186ddb78c226b61906583 /src/plugins/platforms/windows/openglblacklists | |
parent | 5545e5aa6e265469d278e1fb576a737535784422 (diff) | |
parent | 694702e09d9b17d91db282784f009178cfb1059b (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/platforms/minimalegl/qminimaleglintegration.cpp
Change-Id: Ia6ab42a6daadbf8abc085c971545904d49ea4b56
Diffstat (limited to 'src/plugins/platforms/windows/openglblacklists')
-rw-r--r-- | src/plugins/platforms/windows/openglblacklists/default.json | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/plugins/platforms/windows/openglblacklists/default.json b/src/plugins/platforms/windows/openglblacklists/default.json index 1e00da52eb..dd99e674ec 100644 --- a/src/plugins/platforms/windows/openglblacklists/default.json +++ b/src/plugins/platforms/windows/openglblacklists/default.json @@ -102,6 +102,18 @@ "features": [ "disable_desktopgl", "disable_d3d11", "disable_d3d9" ] + }, + { + "id": 9, + "description": "Intel 945 crash (QTBUG-40991)", + "vendor_id": "0x8086", + "device_id": [ "0x27A2" ], + "os": { + "type": "win" + }, + "features": [ + "disable_desktopgl" + ] } ] } |