From 35db81f33efe6eb82e27007e144eafffd2bff4eb Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 23 Nov 2017 15:15:46 +0100 Subject: Add NSS to RHEL 7.4 Needed by QtWebEngine Change-Id: I66a737457cb9dd5f2cc53d64f639037926a560ca Reviewed-by: Jani Heikkinen (cherry-picked from 9a9d798ce44ae6a77d408e44dd61fa5a5e07b99f) Reviewed-by: Allan Sandfeld Jensen --- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh index 7bda43e2..a8e812bd 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh @@ -73,6 +73,8 @@ installPackages+=(gperf) installPackages+=(alsa-lib-devel) installPackages+=(pulseaudio-libs-devel) installPackages+=(libXtst-devel) +installPackages+=(nspr-devel) +installPackages+=(nss-devel) # For Android builds installPackages+=(java-1.8.0-openjdk-devel) # For receiving shasum -- cgit v1.2.3 From e067ea2a7299ff2567dd820435884b293ae7489d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 10 Dec 2017 20:10:33 +0200 Subject: Update submodules on '5.9' in qt5 Change-Id: Ib3d4ff60bd232362ca0cf1ad455f09c83643387d Reviewed-by: Liang Qi --- qtbase | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 0c9e379d..d2d6c6f7 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0c9e379dd8c57fab9d8e6ba8d35a0dca8ac05a0a +Subproject commit d2d6c6f7813fa38ced6b80ead763ed6e6daaa951 diff --git a/qtdatavis3d b/qtdatavis3d index cedc6261..c3a97327 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit cedc62610efb1add2a68a179a38db8e668560016 +Subproject commit c3a973273e3c7ac61b8dd9aec282847d30fd4ac1 diff --git a/qtdeclarative b/qtdeclarative index 823428d9..41293196 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 823428d994b0ec0f6b85288d74554660a51b2406 +Subproject commit 41293196b4db1aa7a0c616af312875c484639644 diff --git a/qttools b/qttools index ead44273..f8bb798a 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit ead4427365690b72de63eaf2cd9a1f51fadcc0da +Subproject commit f8bb798ade81f152bc8ff2028e4974150171fa08 diff --git a/qtwayland b/qtwayland index 800c71ca..e74ff73d 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 800c71ca816d76ac4de0616bf54b87f3c1f14c0a +Subproject commit e74ff73d2b2acef0b97530a2c7dd52e20ada6239 diff --git a/qtwebengine b/qtwebengine index f979b271..9f798b78 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit f979b271e158bc93b7361d4b891ed49ee58ab865 +Subproject commit 9f798b787a2542688c30503d3f62fe2d7c4d5a72 -- cgit v1.2.3 From 91df8a3a8f313dd9914ba9bd221ac6cdbf497f99 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 11 Dec 2017 10:56:31 +0100 Subject: Fix syntax error - not use comma in platform_configs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ammends d9f2fe1b7f9b90815b4056c89ec2f670ff12180f Task-number: QTQAINFRA-1636 Change-Id: I92d0af1c62f4c6da92fce1a00d7a2b60055ce8dd Reviewed-by: Tony Sarajärvi --- coin/platform_configs/qtbase.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/qtbase.txt b/coin/platform_configs/qtbase.txt index 45810bce..3292cc6e 100644 --- a/coin/platform_configs/qtbase.txt +++ b/coin/platform_configs/qtbase.txt @@ -1,4 +1,4 @@ Template Target OS Target arch Compiler Features --------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-16.04-x86_64-1 QEMU armv7 GCC DeveloperBuild, DisableTests -qtci-linux-Ubuntu-16.04-x86_64-1 QEMU arm64 GCC DeveloperBuild, DisableTests +qtci-linux-Ubuntu-16.04-x86_64-1 QEMU armv7 GCC DeveloperBuild DisableTests +qtci-linux-Ubuntu-16.04-x86_64-1 QEMU arm64 GCC DeveloperBuild DisableTests -- cgit v1.2.3