From e72a082da5f90c9a450829fc9ab696aac1851b5e Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 9 Apr 2019 09:13:26 +0300 Subject: Provisioning: Remove MSVC 2015 update 3 patch from provisioning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MSVC 2015 update 3 patch seems to be already pre-provisioned with MSVC 2015 update installation Task-number: QTQAINFRA-2899 Change-Id: I582c47e4b54303394805f205c4becf6a74e941ec Reviewed-by: Tony Sarajärvi (cherry picked from commit b3e35cbac501c749cd17a48c8fc85ef6f8acbba7) Reviewed-by: Juha Karjalainen Reviewed-by: Jani Heikkinen --- .../10-msvc_2015_update3_patch.ps1 | 34 ---------------------- 1 file changed, 34 deletions(-) delete mode 100644 coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 (limited to 'coin/provisioning') 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 deleted file mode 100644 index fe1aec7d..00000000 --- a/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 +++ /dev/null @@ -1,34 +0,0 @@ -############################################################################# -## -## 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\windows\msvc_2015_update3_patch.ps1" - -- cgit v1.2.3 From 65cf2cb95725b72bddf54ceb9ae13a01035e00ef Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 24 Apr 2019 13:39:30 +0300 Subject: Provisioning: Install Vulkan to Rhel 7.4 Enables Vulkan support at compile time Task-number: QTBUG-72763 Change-Id: If97adb030d50a147c9714afe3ef360291904b58a Reviewed-by: Laszlo Agocs Reviewed-by: Jani Heikkinen --- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'coin/provisioning') diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh index e86870c0..ed33e81a 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh @@ -112,6 +112,8 @@ installPackages+=(xcb-util-renderutil-devel) # ODBC support installPackages+=(unixODBC-devel) installPackages+=(unixODBC) +# Vulkan support +installPackages+=(vulkan-devel) sudo yum -y install "${installPackages[@]}" -- cgit v1.2.3 From 09f28e9e1d989a70c876138a4cf24e35c67e0fbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Thu, 25 Apr 2019 15:26:37 +0300 Subject: Provisioning: Install python36-devel to rhel 7.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The rhel Python3 system package is missing development libs. Fixes: PYSIDE-996 Change-Id: I3863c85ad04021dd0f0d4af4bae5917a6785a7e1 Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'coin/provisioning') diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh index ed33e81a..b956d6a3 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh @@ -70,6 +70,7 @@ installPackages+=(speech-dispatcher-devel) installPackages+=(python-devel python-pip) # Python 3 with python-devel, pip and virtualenv installPackages+=(rh-python36) +installPackages+=(python36-devel) # WebEngine installPackages+=(bison) installPackages+=(flex) -- cgit v1.2.3