diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-15 20:59:29 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-15 20:59:29 +0100 |
| commit | ea28c00dd6fe28aba178e4efe5800e35d26e043d (patch) | |
| tree | c598de95606e86894b57a98da56d20c7facdcb0e /coin | |
| parent | 443328fa9f47dbd1150e0d498bdb4234a3a917db (diff) | |
| parent | f2dbac41cf12de7fde39eaad4226b409cedbbe92 (diff) | |
Merge remote-tracking branch 'origin/5.10.1' into 5.11
Change-Id: I07cebe617c7860cbeede24b2f45c7c508aed5a92
Diffstat (limited to 'coin')
| -rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh | 8 |
1 files changed, 7 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 9ff1ec6c..b2057b21 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 @@ -94,4 +94,10 @@ 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 -SetEnvVar "QEMU_SET_ENV" "\"FONTCONFIG_FILE=$QEMU_FONTCONFFILE,FONTCONFIG_PATH=$QEMU_FONTCONFPATH\"" +qemu_env="FONTCONFIG_FILE=$QEMU_FONTCONFFILE" +qemu_env="${qemu_env},FONTCONFIG_PATH=$QEMU_FONTCONFPATH" + +# Disable QtWayland window decorations, as they cause flakiness when used inside qemu (QTBUG-66173) +qemu_env="${qemu_env},QT_WAYLAND_DISABLE_WINDOWDECORATION=1" + +SetEnvVar "QEMU_SET_ENV" "\"${qemu_env}\"" |