lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-28 07:37:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	coin/provisioning/common/linux/open62541.sh
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh
	coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh

Done-with: Maurice Kalinowski <maurice.kalinowski@qt.io>
Change-Id: Icd472b8f770a933bafead48093ecf7eb94156128
This commit is contained in:
Liang Qi
2018-02-20 21:22:31 +01:00
parent c64b2415d3 e086fbc6cb
commit 91739f5fe3
16 changed files with 118 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh
View File

@@ -51,6 +51,6 @@ gsettings set org.gnome.desktop.screensaver lock-enabled false
# disable blank screen power saving
gsettings set org.gnome.desktop.session idle-delay 0
if [ "$proxy" != "" ]; then
if [ "$http_proxy" != "" ]; then
echo "proxy=$proxy" | sudo tee -a /etc/yum.conf
fi

1
coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh
View File

@@ -32,6 +32,7 @@
## $QT_END_LICENSE$
##
#############################################################################
set +e
source /opt/rh/devtoolset-4/enable