diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2017-07-28 09:02:50 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-08-02 16:38:28 +0000 |
| commit | a96656a8fb6a3c1fc7765659efff28f807fd0deb (patch) | |
| tree | e534ef66a41c729a3e2e10e481914b83442d21f5 /src/gui | |
| parent | 71e36a42f2e4f46f11524264b880b6a18bc247d2 (diff) | |
ANGLE: Fix build for newer MinGW versions
Availability of D3D11_QUERY_DATA_TIMESTAMP_DISJOINT depends on the used
MinGW version so that the check for MINGW is not sufficient. The newly
added configure test can be used for every toolset.
Task-number: QTBUG-57916
Change-Id: Ia9cb48f3e673841101a93cbc8ea23aff9547f639
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/configure.json | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index 062171606e..6fdeefe14a 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -591,6 +591,11 @@ }, "tests": { + "angle_d3d11_qdtd": { + "label": "D3D11_QUERY_DATA_TIMESTAMP_DISJOINT", + "type": "compile", + "test": "win/angle_d3d11_qdtd" + }, "directwrite2": { "label": "DirectWrite 2", "type": "compile", @@ -842,6 +847,11 @@ { "type": "define", "name": "QT_OPENGL_ES_2_ANGLE" } ] }, + "angle_d3d11_qdtd": { + "label": "D3D11_QUERY_DATA_TIMESTAMP_DISJOINT", + "condition": "features.angle && tests.angle_d3d11_qdtd", + "output": [ "privateFeature" ] + }, "combined-angle-lib": { "label": "Combined ANGLE Library", "autoDetect": false, |