diff options
author | Liang Qi <liang.qi@qt.io> | 2018-04-25 20:14:43 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-04-25 20:14:43 +0200 |
commit | c4d98c8dd1397367ae2a91daf5fec04743e5905d (patch) | |
tree | e207b7b486822a77f7fa257bd980e2262ffc3bd8 | |
parent | 4442b551beac21376a38a575b60ee903134b9a17 (diff) | |
parent | 8115be28119b330c51be843bee4d19de6c789072 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ie540fd9391b53aa249c1c46bf1089575572612de
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh | 3 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh index 119a1008..938ef37c 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh @@ -59,3 +59,6 @@ echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/h if [ "$http_proxy" != "" ]; then echo "Acquire::http::Proxy \"$proxy\";" | sudo tee -a /etc/apt/apt.conf fi + +# This won't be needed for Ubuntu 17 and above, see QTBUG-67757. +sudo sed -i '/-UnityDecoration-extents/c\ -UnityDecoration-extents: 0 0 0 0;' /usr/share/themes/Ambiance/gtk-3.0/apps/unity.css diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh index cbdcbf64..f32af9b5 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh @@ -60,5 +60,8 @@ sudo zypper -nq install libxslt-devel sudo zypper -nq install gstreamer-devel sudo zypper -nq install gstreamer-plugins-base-devel +# pulseaudio (qtmultimedia) +sudo zypper -nq install libpulse-devel + # cups sudo zypper -nq install cups-devel |