lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-01-10 00:46:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.11' into dev

Browse Source 
Change-Id: Ie540fd9391b53aa249c1c46bf1089575572612de
This commit is contained in:
Liang Qi
2018-04-25 20:14:43 +02:00
parent 4442b551be 8115be2811
commit c4d98c8dd1
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh
View File

@@ -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

3
coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh
View File

@@ -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