diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-22 17:31:41 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-27 09:13:15 +0000 |
commit | d1658baf2ab77199201165218b50ee6bb21cc7bd (patch) | |
tree | dfee4a6b6e982c7b8d5785f45729e39bbc5c6eb4 /tools/qmake | |
parent | e32733998ecbe37882161c19b4233ff1aed758dd (diff) |
Require VS 2015 update 3 or higher
Change-Id: I7443f28ee75aa855d2c6cce237562acd7daacf43
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'tools/qmake')
-rw-r--r-- | tools/qmake/config.tests/winversion/winversion.cpp | 36 | ||||
-rw-r--r-- | tools/qmake/config.tests/winversion/winversion.pro | 3 | ||||
-rw-r--r-- | tools/qmake/mkspecs/features/configure.prf | 4 |
3 files changed, 43 insertions, 0 deletions
diff --git a/tools/qmake/config.tests/winversion/winversion.cpp b/tools/qmake/config.tests/winversion/winversion.cpp new file mode 100644 index 000000000..3a7b67212 --- /dev/null +++ b/tools/qmake/config.tests/winversion/winversion.cpp @@ -0,0 +1,36 @@ +/**************************************************************************** +** +** 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(_MSC_FULL_VER) || _MSC_FULL_VER < 190024213 +#error VS 2015 Update 3 with Cumulative Servicing Release or higher is required +#endif + +int main(int, char **) +{ + return 0; +} diff --git a/tools/qmake/config.tests/winversion/winversion.pro b/tools/qmake/config.tests/winversion/winversion.pro new file mode 100644 index 000000000..dc501a2f6 --- /dev/null +++ b/tools/qmake/config.tests/winversion/winversion.pro @@ -0,0 +1,3 @@ +CONFIG-=qt +CONFIG+=console +win32: SOURCES += winversion.cpp diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf index 1c905df2c..768b86a30 100644 --- a/tools/qmake/mkspecs/features/configure.prf +++ b/tools/qmake/mkspecs/features/configure.prf @@ -110,6 +110,10 @@ defineTest(runConfigure) { } } + win32 { + !config_winversion: skipBuild("Needs VS 2015 Update 3 with Cumulative Servicing Release or higher") + } + isEmpty(skipBuildReason): { cache(CONFIG, add, $$list(webengine_successfully_configured)) !isEmpty(WEBENGINE_CONFIG) { |