diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-19 09:47:29 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-19 09:47:29 +0200 |
| commit | 407302fb1b823fbe0ae09c031862f87b252489e6 (patch) | |
| tree | f192faf40b9009ee6a884ed4b7d0b3942b6810ac /src/plugins/platforms/windows/openglblacklists/default.json | |
| parent | 0f30dcaea8129092142fe87d2d14209c75363f66 (diff) | |
| parent | ad3b41a06d9ba7219c79b5548c5b11698787288d (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/corelib/io/qwindowspipewriter.cpp
src/widgets/styles/qcommonstyle.cpp
Change-Id: I0d33efdc4dc256e234abc490a18ccda72cd1d9e6
Diffstat (limited to 'src/plugins/platforms/windows/openglblacklists/default.json')
| -rw-r--r-- | src/plugins/platforms/windows/openglblacklists/default.json | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/plugins/platforms/windows/openglblacklists/default.json b/src/plugins/platforms/windows/openglblacklists/default.json index 6515f02830..69f4a54d05 100644 --- a/src/plugins/platforms/windows/openglblacklists/default.json +++ b/src/plugins/platforms/windows/openglblacklists/default.json @@ -126,18 +126,6 @@ "features": [ "disable_desktopgl" ] - }, - { - "id": 11, - "description": "VMWare Workstation Player 12 has insufficient support for OpenGL", - "vendor_id": "0x15AD", - "device_id": [ "0x0405" ], - "os": { - "type": "win" - }, - "features": [ - "disable_desktopgl", "disable_d3d11" - ] } ] } |