From d8e1574d5fb42d8733b0a1dacc2dff400f7abeba Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Thu, 11 Jan 2018 10:00:34 +0100 Subject: [PATCH 1/2] Install p7zip-full, that contains the 7z binary MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit p7zip is only a minimal version containing 7zr. Change-Id: I12531514490b6eb871419bdb61ea5896b175a678 Reviewed-by: Simo Fält --- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh index ef2b14d0..b81162d5 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh @@ -55,7 +55,7 @@ try # immediately as one starts debugging installPackages+=(git) # 7zip is a needed decompressing tool - installPackages+=(p7zip) + installPackages+=(p7zip-full) # libssl-dev provides headers for OpenSSL installPackages+=(libssl-dev) # Needed libraries for X11 support accordingly to https://wiki.qt.io/Building_Qt_5_from_Git From fb1c052f3b866efb74fc1d80d11d8895496b5e44 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 11 Jan 2018 19:19:05 +0100 Subject: [PATCH 2/2] Update submodules on '5.9' in qt5 Change-Id: I7cfbf55bc3b57092e5f20a32866bb9cfa9160b9b Reviewed-by: Liang Qi --- qtactiveqt | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtquickcontrols2 | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 9647c0b5..15c9ffc2 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 9647c0b54f1aa0ffdf3a6d23a80a0802c6f3e343 +Subproject commit 15c9ffc20f205e32b9297249be944bcbedd84fc7 diff --git a/qtbase b/qtbase index 1df2906c..5ba29e16 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1df2906c75f379a62bce487d3d2db3ade3095b16 +Subproject commit 5ba29e1672dafe16be004409661aef3a7ebf499a diff --git a/qtdeclarative b/qtdeclarative index ddf495fb..bbf3c471 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit ddf495fb81ea89173af3310f50314b177bc866d2 +Subproject commit bbf3c4715a1569b26a3aa029046e26989efd6edc diff --git a/qtlocation b/qtlocation index 8825b9f9..444e178a 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 8825b9f97612442b645cc4dc428cb2c80349abbe +Subproject commit 444e178a0779f1b0d28e2de1d4dc6a4b228c7a5d diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 55522df4..d61567f3 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 55522df46edd295a65edd32e0ca7d32408ab6de4 +Subproject commit d61567f3cfa100aeab865bd6b436de87970575f5