diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-04-30 17:24:22 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-04-30 18:35:08 +0200 |
| commit | 54c94ae681e3a2689468ce810884e5f5611b97f0 (patch) | |
| tree | 1f4e4223357b1a1d05b8e72beb99393dfbff9920 /coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | |
| parent | ff4a1141f26e66934d043d65881f1cf2aaecc788 (diff) | |
| parent | 5f03b84e6542f00cf9eccd1d8820f423cee5e2b9 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
.gitmodules
coin/platform_configs/default.yaml
coin/platform_configs/qt5.yaml
coin/platform_configs/qtbase.yaml
coin/platform_configs/qtwebkit.yaml
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
Change-Id: If6b0f7a671a69d6a2444ee4d26b324e4d269970c
Diffstat (limited to 'coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh')
| -rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh index 15d41b8a..9aec5d67 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -177,6 +177,11 @@ installPackages+=(libpcre2-dev) # Needed for qtgampepad installPackages+=(libsdl2-2.0) installPackages+=(libsdl2-dev) +# Needed for qtwebkit +installPackages+=(ruby) +installPackages+=(libxslt1-dev) +installPackages+=(libxml2-dev) +installPackages+=(libhyphen-dev) echo "Running update for apt" waitLoop |