diff options
author | Jani Heikkinen <jani.heikkinen@qt.io> | 2018-01-05 07:46:06 +0200 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2018-01-05 07:47:26 +0200 |
commit | 18f6169bee4d687f9aca39cede82e89dbfa95bbe (patch) | |
tree | 470804ca5ec7d0c3368cc3e1c01aa30ff5a1d1b2 /coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 | |
parent | a0bf828433b375c752713d6935ddb9134b2c68d3 (diff) | |
parent | 4fb893fcf8ef55ff3ebbdf684c4d1cfab913cea0 (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.9.4
This merge wasn't done during final downmerge from '5.9' -> '5.9.4'
Change-Id: I516c24ba52575634f3932ff4f40221f31ef06ee0
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1')
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 new file mode 100644 index 00000000..37af7119 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 @@ -0,0 +1,34 @@ +############################################################################# +## +## 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$ +## +############################################################################# +. "$PSScriptRoot\..\common\msvc_2015_update3_patch.ps1" + |