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

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

Browse Source 
Change-Id: I8bb29f5e2edfbee3df2388712137cfd7f31aa3aa
This commit is contained in:
Liang Qi
2018-04-16 10:40:51 +02:00
parent 7f937b6d94 6a06c4b4fe
commit 9a8c6faf26
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh
View File

@@ -63,8 +63,8 @@ installPackages+=(gtk3-devel)
installPackages+=(libusbx-devel)
# speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux
installPackages+=(speech-dispatcher-devel)
# Python 2.7 with python-devel, pip and virtualenv
installPackages+=(python27)
# Python 2 devel and pip. python-pip requires the EPEL repository to be added
installPackages+=(python-devel python-pip)
# Python 3 with python-devel, pip and virtualenv
installPackages+=(rh-python36)
# WebEngine
@@ -98,8 +98,9 @@ installPackages+=(libwayland-server)
sudo yum -y install "${installPackages[@]}"
# Make python 2.7 and its pip default
echo "source scl_source enable python27" >> ~/.bashrc
sudo ln -s /opt/rh/rh-python36/root/usr/bin/python3 /usr/local/bin/python3
sudo ln -s /opt/rh/rh-python36/root/usr/bin/pip3 /usr/local/bin/pip3
# We shouldn't use yum to install virtualenv. The one found from package repo is not
# working, but we can use installed pip
sudo pip install --upgrade pip
sudo pip install virtualenv