diff options
| -rw-r--r-- | config.tests/winversion/winversion.cpp | 36 | ||||
| -rw-r--r-- | config.tests/winversion/winversion.pro | 3 | ||||
| -rw-r--r-- | src/core/configure.json | 10 |
3 files changed, 8 insertions, 41 deletions
diff --git a/config.tests/winversion/winversion.cpp b/config.tests/winversion/winversion.cpp deleted file mode 100644 index e9a4cff59..000000000 --- a/config.tests/winversion/winversion.cpp +++ /dev/null @@ -1,36 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWebEngine module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** 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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#if !defined(__clang__) && _MSC_FULL_VER < 191426428 -#error unsupported Visual Studio version -#endif - -int main(int, char **) -{ - return 0; -} diff --git a/config.tests/winversion/winversion.pro b/config.tests/winversion/winversion.pro deleted file mode 100644 index dc501a2f6..000000000 --- a/config.tests/winversion/winversion.pro +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG-=qt -CONFIG+=console -win32: SOURCES += winversion.cpp diff --git a/src/core/configure.json b/src/core/configure.json index 14211a2f1..d868e7f12 100644 --- a/src/core/configure.json +++ b/src/core/configure.json @@ -318,8 +318,14 @@ }, "webengine-winversion": { "label": "winversion", - "test": "winversion", - "type": "compile" + "type": "compile", + "test": { + "head" : [ + "#if !defined(__clang__) && _MSC_FULL_VER < 191426428", + "#error unsupported Visual Studio version", + "#endif" + ] + } }, "webengine-protoc": { "label": "protoc", |