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

Provisioning: Fix Protobuf installation for Ubuntu 22.04

Browse Source 
Cmake environment variable need to be read from .bash_profile
(or .bashrc) instead of .profile with Ubuntu 22.04

Change-Id: Ic0589666e48946ba05366304407a0e5824b27a2c
Reviewed-by: Liang Qi <liang.qi@qt.io>
This commit is contained in:
Heikki Halmet
2022-09-13 11:32:54 +03:00
committed by Liang Qi
parent de8a8879bd
commit 911505cd37
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
coin/provisioning/common/unix/install_protobuf.sh
View File

@@ -2,7 +2,7 @@
#############################################################################
##
## Copyright (C) 2018 The Qt Company Ltd.
## Copyright (C) 2022 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -46,7 +46,11 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh"
# Extract cmake path from the environment
if uname -a |grep -q "Ubuntu"; then
source ~/.profile
if lsb_release -a |grep "Ubuntu 22.04"; then
source ~/.bash_profile
else
source ~/.profile
fi
else
source ~/.bashrc
fi