diff options
author | Liang Qi <liang.qi@qt.io> | 2017-05-07 22:11:10 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-05-08 08:35:30 +0200 |
commit | 41379a50c7b99987842cb6467c37bcc63cf0f0c8 (patch) | |
tree | be195057400aef094d01cf77758b287c32822fb9 /coin/provisioning/qtci-windows-10-x86_64 | |
parent | f5754fd722c981ca157e7c650ecd271c9077b7cc (diff) | |
parent | a4a7f71f37843d6f0809855ba443541faa3cdc87 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.9.0
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
Change-Id: Id82a13a6b2fe6db60c286e470396298c08e363b8
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86_64')
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/msvc.ps1 | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86_64/msvc.ps1 b/coin/provisioning/qtci-windows-10-x86_64/msvc.ps1 new file mode 100644 index 00000000..1de57a66 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/msvc.ps1 @@ -0,0 +1,43 @@ +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## 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 http://www.qt.io/terms-conditions. For further +## information use the contact form at http://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 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# Visual Studios are pre-provisioned to tier1 images + +# MSVC 2015 Update 3 +echo "Visual Studio 2015 = Version 14.0.25421.3 Update 3" >> ~\versions.txt + +# MSVC 2017 +echo "Visual Studio 2017 = Version 15.1 (26403.7)" >> ~\versions.txt + +# MSVC 2017 Build Tools +echo "Visual Studio 2017 Build Tools = Version 15.1 (26403.7)" >> ~\versions.txt |