diff options
author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-29 13:53:08 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-29 14:06:05 +0100 |
commit | a434f14bd93f387f5f981fcd7d27ce95384d1ce6 (patch) | |
tree | b5cc79dd41ef6dd3c49dafcf899d469574632123 /coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh | |
parent | 282899453d2c6b4c51bbd94fc228f2bb711d64f6 (diff) | |
parent | 351a519340d509300c754d0a62771a7f6e38ea4c (diff) |
Merge remote-tracking branch 'origin/5.10' into 5.11
Conflicts:
coin/provisioning/common/linux/qnx_700.sh
coin/provisioning/common/windows/libclang.ps1
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Change-Id: I7fe1337fb8a575083e8b649d1a051abc82e3b408
Diffstat (limited to 'coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh')
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh index 74ef2b4e..9ff1ec6c 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh @@ -33,6 +33,9 @@ ############################################################################# set -ex + +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" + # build latest qemu to usermode sudo apt-get -y install automake autoconf libtool @@ -91,4 +94,4 @@ sed $QEMU_FONTCONFFILE -e "s:/usr/share/fonts:$QEMU_FONTCONFPATH/fonts:" -i sed $QEMU_FONTCONFFILE -e "s:/usr/local/share/fonts:$QEMU_FONTCONFPATH/local_fonts:" -i # Set QEMU font configuration variables -echo "export QEMU_SET_ENV=\"FONTCONFIG_FILE=$QEMU_FONTCONFFILE,FONTCONFIG_PATH=$QEMU_FONTCONFPATH\"" >> ~/.profile +SetEnvVar "QEMU_SET_ENV" "\"FONTCONFIG_FILE=$QEMU_FONTCONFFILE,FONTCONFIG_PATH=$QEMU_FONTCONFPATH\"" |