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 /config.tests/win | |
| 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 'config.tests/win')
| -rw-r--r-- | config.tests/win/angle_d3d11_qdtd/angle_d3d11_qdtd.cpp | 47 | ||||
| -rw-r--r-- | config.tests/win/angle_d3d11_qdtd/angle_d3d11_qdtd.pro | 3 |
2 files changed, 50 insertions, 0 deletions
diff --git a/config.tests/win/angle_d3d11_qdtd/angle_d3d11_qdtd.cpp b/config.tests/win/angle_d3d11_qdtd/angle_d3d11_qdtd.cpp new file mode 100644 index 0000000000..2dde2914a2 --- /dev/null +++ b/config.tests/win/angle_d3d11_qdtd/angle_d3d11_qdtd.cpp @@ -0,0 +1,47 @@ +/**************************************************************************** +** +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the config.tests of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <D3D11.h> + +int main(int, char**) +{ + D3D11_QUERY_DATA_TIMESTAMP_DISJOINT qdtd; + (void)qdtd; + return 0; +} diff --git a/config.tests/win/angle_d3d11_qdtd/angle_d3d11_qdtd.pro b/config.tests/win/angle_d3d11_qdtd/angle_d3d11_qdtd.pro new file mode 100644 index 0000000000..f1e530ab6e --- /dev/null +++ b/config.tests/win/angle_d3d11_qdtd/angle_d3d11_qdtd.pro @@ -0,0 +1,3 @@ +SOURCES = angle_d3d11_qdtd.cpp +CONFIG -= qt +CONFIG += console |