From 0ae61f0f4d13eaa952e2bb81a5b485ed7784ab26 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 14 Dec 2017 23:16:51 +0100 Subject: [PATCH 1/8] Update submodules on '5.9' in qt5 Change-Id: Ibdf2e0ca968b4fa5c0a5be8c6bfc1d05aa90d17d Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtimageformats | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qt3d b/qt3d index 37d78994..c9edc164 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 37d78994de56cd11a06ccd1a777cf0ac8ec8e801 +Subproject commit c9edc164ab165ddd31ef2411be19deb130614e8b diff --git a/qtbase b/qtbase index 782eb1a1..dc0bb57f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 782eb1a114c0aaa729925899b2061d47f494435f +Subproject commit dc0bb57f8600374b7279d5c14456a33a9d0c0476 diff --git a/qtdeclarative b/qtdeclarative index ae01e0db..243b819f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit ae01e0dbf50cb6da1967e10eb95d63313dc5aa7a +Subproject commit 243b819ff73f6aaa9dc068d43b8b918a98f53663 diff --git a/qtimageformats b/qtimageformats index 4a5d500d..1225d9e4 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 4a5d500d6da8c7af2d3abfcf759586d5756efa77 +Subproject commit 1225d9e4aac319cb92ef88ebf7de305033ef30ba diff --git a/qtmultimedia b/qtmultimedia index 10998733..9caee039 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 10998733af8a3d54b795ee57a8df9a1b3e776aae +Subproject commit 9caee039533168fbb546b563859770414e54fc94 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index d9e740d2..4a077f71 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit d9e740d2ccf8c1d3caacfcd95537718048e3a7ba +Subproject commit 4a077f719dff799a89b5f370dfc71a7bd14b0930 diff --git a/qttools b/qttools index 796a5e00..2f3dc790 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 796a5e005fa1ae2bfe6f9278fc482723eb89f429 +Subproject commit 2f3dc790aefadc74debfa25efe958078def34146 diff --git a/qtwebengine b/qtwebengine index 260e9dd9..d4b3d945 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 260e9dd9b98c2bc90229f7d2f7aba8cc0029d24d +Subproject commit d4b3d9457bbe090c4ecc0d5a7d70e7bb08b22b90 diff --git a/qtwebview b/qtwebview index 17e076b5..4d4b118c 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 17e076b56e40e25248f156830b293fee6421ecfc +Subproject commit 4d4b118c1294d96741d71a775ac1c57b5acb96bb From 04f8860d8c5b1a3a55bac82b98304c428ddce745 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Fri, 15 Dec 2017 14:35:53 +0100 Subject: [PATCH 2/8] Install cups-devel in OpenSuse This way we have one build that compiles the "with cups" branch and others (the ubuntu ones) that compile the "without cups" code branch Change-Id: I45ab3d72c34367789e0f344c917a88269883cffe Reviewed-by: Frederik Gladhorn --- .../qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh index fb2b81dd..132b3361 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh @@ -46,3 +46,6 @@ sudo zypper -nq install libXrandr-devel sudo zypper -nq install libXtst-devel sudo zypper -nq install mozilla-nspr-devel sudo zypper -nq install mozilla-nss-devel + +# cups +sudo zypper -nq install cups-devel From 41edaa5fb94efb30f06f00713fe020350d20d712 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 18 Dec 2017 21:08:17 +0100 Subject: [PATCH 3/8] Update submodules on '5.9' in qt5 Change-Id: I85ef0fa0ae59f600ab53e9b566a08b2f22184f33 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qttranslations | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index dc0bb57f..b0938cb6 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit dc0bb57f8600374b7279d5c14456a33a9d0c0476 +Subproject commit b0938cb6c1fa29ec2d2a4fb9273e515cd0d6c08e diff --git a/qtdeclarative b/qtdeclarative index 243b819f..e8570bd1 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 243b819ff73f6aaa9dc068d43b8b918a98f53663 +Subproject commit e8570bd1af74724b6fae1ac8a2d8bbdfee7a6504 diff --git a/qtquickcontrols b/qtquickcontrols index 37592ad9..8a0f0553 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 37592ad9c6df35bdd37609569963fe7361cdad85 +Subproject commit 8a0f0553e4eb8468513bbb8ba45a9ec2bcd6ce68 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 4a077f71..6b89293b 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 4a077f719dff799a89b5f370dfc71a7bd14b0930 +Subproject commit 6b89293b99e763589181fd1f75470712f52cee3c diff --git a/qttranslations b/qttranslations index 6987cf96..b3684346 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 6987cf9681dfb6c212a3225a8669499d3dfe1871 +Subproject commit b3684346bd60983cecf2524f9f8081df514b5cb0 diff --git a/qtwebengine b/qtwebengine index d4b3d945..5b160be9 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d4b3d9457bbe090c4ecc0d5a7d70e7bb08b22b90 +Subproject commit 5b160be90599d13707610f253f541ff0c97c08e3 From d55baf5baf60e1deb0fa656652f617dac01b1236 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 13 Dec 2017 15:47:15 +0100 Subject: [PATCH 4/8] Simplify apt package installation and disable daily package maintenance MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead of using aptdcon, we can continue to use apt-get to install the software. We just need to make sure that the automatic update and package upgrade services are disabled. This is generally desirable as we do not want these kind of activities to occur in the background while building or running tests. This also fixes the broken package installation via regex, which apt-get supports but aptdcon does not. Revert "Fix Ubuntu 16.04 random provisioning fail" This reverts commit 537ea17d14526bc6564765e2dd4652e11a3ed235. Conflicts: coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh Change-Id: I920e5132bb0a248d3794e1efcf01ce78d28e6ee3 Reviewed-by: Joni Jäntti Reviewed-by: Frederik Gladhorn Reviewed-by: Jędrzej Nowacki --- .../qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh | 42 ++++++++++--------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh index 9b71f935..980da2ca 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh @@ -45,47 +45,51 @@ try ( echo "Disabling auto update" sudo sed -i 's/APT::Periodic::Update-Package-Lists "1";/APT::Periodic::Update-Package-Lists "0";/' /etc/apt/apt.conf.d/10periodic || throw $ExceptionSED + for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-daily-upgrade.service; do + sudo systemctl stop $service + sudo systemctl disable $service + done echo "Running update for apt" sudo apt-get update echo "Installing packages" # Git is not needed by builds themselves, but is nice to have # immediately as one starts debugging - yes | sudo aptdcon --hide-terminal --install git || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install git || throw $ExceptionAPT # 7zip is a needed decompressing tool - yes | sudo aptdcon --hide-terminal --install p7zip || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install p7zip || throw $ExceptionAPT # libssl-dev provides headers for OpenSSL - yes | sudo aptdcon --hide-terminal --install libssl-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libssl-dev || throw $ExceptionAPT # Needed libraries for X11 support accordingly to https://wiki.qt.io/Building_Qt_5_from_Git - yes | sudo aptdcon --hide-terminal --install "^libxcb.*" libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "^libxcb.*" libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev || throw $ExceptionAPT # Enable linking to system dbus - yes | sudo aptdcon --hide-terminal --install libdbus-1-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libdbus-1-dev || throw $ExceptionAPT # Needed libraries for WebEngine - yes | sudo aptdcon --hide-terminal --install libudev-dev libegl1-mesa-dev libfontconfig1-dev libxss-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libudev-dev libegl1-mesa-dev libfontconfig1-dev libxss-dev || throw $ExceptionAPT # Common event loop handling - yes | sudo aptdcon --hide-terminal --install libglib2.0-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libglib2.0-dev || throw $ExceptionAPT # MySQL support - yes | sudo aptdcon --hide-terminal --install libmysqlclient-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libmysqlclient-dev || throw $ExceptionAPT # PostgreSQL support - yes | sudo aptdcon --hide-terminal --install libpq-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libpq-dev || throw $ExceptionAPT # SQLite support - yes | sudo aptdcon --hide-terminal --install libsqlite3-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libsqlite3-dev || throw $ExceptionAPT # ODBC support - yes | sudo aptdcon --hide-terminal --install unixodbc-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install unixodbc-dev || throw $ExceptionAPT # Support for FreeType font engine - yes | sudo aptdcon --hide-terminal --install libfreetype6-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libfreetype6-dev || throw $ExceptionAPT # Enable the usage of system jpeg libraries - yes | sudo aptdcon --hide-terminal --install libjpeg-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libjpeg-dev || throw $ExceptionAPT # Enable support for printer driver - yes | sudo aptdcon --hide-terminal --install libcups2-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libcups2-dev || throw $ExceptionAPT # Install libraries needed for QtMultimedia to be able to support all plugins - yes | sudo aptdcon --hide-terminal --install libasound2-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev || throw $ExceptionAPT - yes | sudo aptdcon --hide-terminal --install libgstreamer-plugins-good1.0-dev libgstreamer-plugins-bad1.0-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libasound2-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libgstreamer-plugins-good1.0-dev libgstreamer-plugins-bad1.0-dev || throw $ExceptionAPT # Support for cross-building to x86 (needed by WebEngine boot2qt builds) - yes | sudo aptdcon --hide-terminal --install g++-multilib || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install g++-multilib || throw $ExceptionAPT # python3 development package - yes | sudo aptdcon --hide-terminal --install python3-dev python3-pip python3-virtualenv || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install python3-dev python3-pip python3-virtualenv || throw $ExceptionAPT # Automates interactive applications (Needed by RTA to automate configure testing) - yes | sudo aptdcon --hide-terminal --install expect || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install expect || throw $ExceptionAPT ) catch || { case $ex_code in From dd7f4112fd424c368906e99559ed0de7b9f227d6 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 21 Dec 2017 21:44:16 +0100 Subject: [PATCH 5/8] Update submodules on '5.9' in qt5 Change-Id: Ice93ecfe5e5c093c7bf455c05b87383cf157ed2e Reviewed-by: Liang Qi --- qtbase | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtspeech | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qtbase b/qtbase index b0938cb6..ffc8409a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b0938cb6c1fa29ec2d2a4fb9273e515cd0d6c08e +Subproject commit ffc8409aa58c04c1dd140001976b55925ac959f6 diff --git a/qtdatavis3d b/qtdatavis3d index de346171..4cd89b61 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit de346171018b353d2abcfb589e644480c2aa6fd5 +Subproject commit 4cd89b61be205fc52ce1b227fe55e4de04196db7 diff --git a/qtdeclarative b/qtdeclarative index e8570bd1..52bc4fbf 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit e8570bd1af74724b6fae1ac8a2d8bbdfee7a6504 +Subproject commit 52bc4fbfbae6aa1569dc134dd103e966f04bc2e6 diff --git a/qtdoc b/qtdoc index b8556f01..0703849b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit b8556f01d711389d94cc1ccb864324b24c0e7def +Subproject commit 0703849b6d6a63873fc9334d573b7ee85256c655 diff --git a/qtlocation b/qtlocation index 730b2bd9..7508f021 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 730b2bd96e88fe63364c9f81e299555f0b1f0daa +Subproject commit 7508f02176f317db50f20985205bf64af8134ab6 diff --git a/qtmultimedia b/qtmultimedia index 9caee039..c8bf0cd3 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 9caee039533168fbb546b563859770414e54fc94 +Subproject commit c8bf0cd37c5f526e3687dfeff9e23d15104328b5 diff --git a/qtqa b/qtqa index 1110bd07..956200a1 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 1110bd076dba536dc6e6304fe8d6ee80f2d5718f +Subproject commit 956200a160b0a1a9a15bbcd24c6c82e4dc01c2b6 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 6b89293b..c40486ac 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 6b89293b99e763589181fd1f75470712f52cee3c +Subproject commit c40486acc352d49398186fa32d1ccabdd5fc83c6 diff --git a/qtremoteobjects b/qtremoteobjects index 170aa77f..286f3c62 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 170aa77ff7a38ba2ddbc68f75c1ac38a47af87ea +Subproject commit 286f3c626087635cb24708b8e42b1d8af0401640 diff --git a/qtscript b/qtscript index c904f06f..ef6c88d3 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit c904f06f716585edd94dbd1b4271dcbf305c268a +Subproject commit ef6c88d329386ece5b4a92d6a0865d7b90e036c0 diff --git a/qtspeech b/qtspeech index 53afd080..16ab9c26 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 53afd0808aeae53bf1ad94647be936cce00ef9a1 +Subproject commit 16ab9c262b1d53222913da96f7a14485e3ef0836 diff --git a/qtwayland b/qtwayland index 6bd70687..154bdf45 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 6bd70687aa32d1ad6fedc7cfad499fdaf037193e +Subproject commit 154bdf45dd51a521058c820e7b871008ce8508ae diff --git a/qtwebengine b/qtwebengine index 5b160be9..17ecc4e7 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 5b160be90599d13707610f253f541ff0c97c08e3 +Subproject commit 17ecc4e7e0c88d891e1b18d5810a7ac2fd0b83ba From 21cbacf4b40cd261a3dca6fbf52e2ed6c379fe94 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Tue, 19 Dec 2017 10:31:03 +0200 Subject: [PATCH 6/8] Remove 'Packaging' flag from builds we don't need it We don't offer binaries for INTEGRITY, MSVC2013 32 bit or MSVC2017 32bit so we don't need 'packaging' flag there either Task-number: QTBUG-65324 Change-Id: If9e8fdebab44fcafde9b4da893be6f79f6287aac Reviewed-by: Iikka Eklund --- coin/platform_configs/default.txt | 2 +- coin/platform_configs/qt5.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 4f6920c9..5cb2bff5 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -22,4 +22,4 @@ qtci-linux-Ubuntu-16.04-x86_64-1 QEMU armv7 GCC qtci-linux-Ubuntu-16.04-x86_64-1 QEMU arm64 GCC Release qtci-linux-Ubuntu-16.04-x86_64-1 GCC TestOnly LicenseCheck qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 5282634a..558a756b 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,9 +1,9 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-8.1-x86_64 x86 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests +qtci-windows-8.1-x86_64 x86 MSVC2013 DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-8.1-x86_64 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86-6 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86-6 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-7-x86-3 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests From 88a1c161e5e61a369518833a1283c9fb7a76b1d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 14 Dec 2017 14:08:38 +0200 Subject: [PATCH 7/8] Remove unneeded OS X provisioning scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Icf03c93adee31baac383d1394857df8c2df4fe59 Reviewed-by: Joni Jäntti Reviewed-by: Simo Fält --- coin/provisioning/qtci-osx-10.8-x86_64/001-system_updates.sh | 4 ---- coin/provisioning/qtci-osx-10.8-x86_64/025-python3.sh | 1 - coin/provisioning/qtci-osx-10.9-x86_64/001-system_updates.sh | 4 ---- coin/provisioning/qtci-osx-10.9-x86_64/025-python3.sh | 1 - coin/provisioning/qtci-osx-10.9-x86_64/08-libclang.sh | 5 ----- 5 files changed, 15 deletions(-) delete mode 100755 coin/provisioning/qtci-osx-10.8-x86_64/001-system_updates.sh delete mode 100644 coin/provisioning/qtci-osx-10.8-x86_64/025-python3.sh delete mode 100755 coin/provisioning/qtci-osx-10.9-x86_64/001-system_updates.sh delete mode 100644 coin/provisioning/qtci-osx-10.9-x86_64/025-python3.sh delete mode 100755 coin/provisioning/qtci-osx-10.9-x86_64/08-libclang.sh diff --git a/coin/provisioning/qtci-osx-10.8-x86_64/001-system_updates.sh b/coin/provisioning/qtci-osx-10.8-x86_64/001-system_updates.sh deleted file mode 100755 index b05dcf1c..00000000 --- a/coin/provisioning/qtci-osx-10.8-x86_64/001-system_updates.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -BASEDIR=$(dirname "$0") -$BASEDIR/../common/system_updates.sh diff --git a/coin/provisioning/qtci-osx-10.8-x86_64/025-python3.sh b/coin/provisioning/qtci-osx-10.8-x86_64/025-python3.sh deleted file mode 100644 index cd4e3fd9..00000000 --- a/coin/provisioning/qtci-osx-10.8-x86_64/025-python3.sh +++ /dev/null @@ -1 +0,0 @@ -source "${BASH_SOURCE%/*}/../common/python3.sh" diff --git a/coin/provisioning/qtci-osx-10.9-x86_64/001-system_updates.sh b/coin/provisioning/qtci-osx-10.9-x86_64/001-system_updates.sh deleted file mode 100755 index b05dcf1c..00000000 --- a/coin/provisioning/qtci-osx-10.9-x86_64/001-system_updates.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -BASEDIR=$(dirname "$0") -$BASEDIR/../common/system_updates.sh diff --git a/coin/provisioning/qtci-osx-10.9-x86_64/025-python3.sh b/coin/provisioning/qtci-osx-10.9-x86_64/025-python3.sh deleted file mode 100644 index cd4e3fd9..00000000 --- a/coin/provisioning/qtci-osx-10.9-x86_64/025-python3.sh +++ /dev/null @@ -1 +0,0 @@ -source "${BASH_SOURCE%/*}/../common/python3.sh" diff --git a/coin/provisioning/qtci-osx-10.9-x86_64/08-libclang.sh b/coin/provisioning/qtci-osx-10.9-x86_64/08-libclang.sh deleted file mode 100755 index d257ffa1..00000000 --- a/coin/provisioning/qtci-osx-10.9-x86_64/08-libclang.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -BASEDIR=$(dirname "$0") -# There is only one mac package and common script uses it as a default -$BASEDIR/../common/libclang.sh From de0d7005ccff69ef1ea4c3ad42a2bf4033e26429 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Wed, 20 Dec 2017 08:08:01 +0200 Subject: [PATCH 8/8] Fix Android provisioning script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We have to accept extra license to enable installing all required packages. Task-number: QTQAINFRA-1660 Change-Id: I9d014991be96ff0723688b317a645e281b3e92d0 Reviewed-by: Tony Sarajärvi (cherry picked from commit 5df4ec2ec999440ba291f2bf2f9fa6b72810660d) --- coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh b/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh index e041027d..bc8a95e6 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh @@ -77,7 +77,7 @@ try sudo chown -R qt:wheel "$targetFolder" echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion." - echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager + (echo "y"; echo "y") |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager echo "export ANDROID_SDK_HOME=$sdkTargetFolder" >> ~/.bashrc echo "export ANDROID_NDK_HOME=$targetFolder/android-ndk-$ndkVersion" >> ~/.bashrc