mirror of
git://code.qt.io/qt/qt5.git
synced 2026-04-26 22:58:17 +08:00
Merge remote-tracking branch 'origin/5.9' into 5.11
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:
@@ -33,11 +33,23 @@
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
set +e
|
||||
|
||||
# We need to source to be able to use cmake in the shell
|
||||
if uname -a |grep -q "Ubuntu"; then
|
||||
source ~/.profile
|
||||
else
|
||||
source ~/.bashrc
|
||||
fi
|
||||
|
||||
set -ex
|
||||
|
||||
TEMPDIR=$(mktemp --directory) || echo "Failed to create temporary directory"
|
||||
trap "sudo rm -fr $TEMPDIR" EXIT
|
||||
cd $TEMPDIR
|
||||
|
||||
pip install six
|
||||
sudo pip install --upgrade pip
|
||||
sudo pip install six
|
||||
|
||||
git clone https://github.com/open62541/open62541.git open62541
|
||||
cd open62541
|
||||
|
||||
Reference in New Issue
Block a user