Skip to content

Commit 7266988

Browse files
committed
Vagrant: use Qt5.9.3 deps
1 parent 2a2dd10 commit 7266988

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

.vagrantconfig.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
configs:
22
dev:
3-
'qt_deps_tarball': 'Qt5.9.1-linux-vagrant.tar.bz2'
3+
'qt_deps_tarball': 'Qt5.9.3-gcc_64-min.tar.bz2'
44
'qt_deps_unpack_parent_dir': '/tmp'
55

6-
'qt_deps_unpack_dir': '/tmp/Qt5.9-vagrant/5.9.1'
7-
'qt_deps_bin_unpack_dir': '/tmp/Qt5.9-vagrant/5.9.1/gcc_64/bin'
8-
'qt_deps_lib_unpack_dir': '/tmp/Qt5.9-vagrant/5.9.1/gcc_64/lib'
9-
'qt_deps_plugins_unpack_dir': '/tmp/Qt5.9-vagrant/5.9.1/gcc_64/plugins'
10-
'qt_deps_qml_unpack_dir': '/tmp/Qt5.9-vagrant/5.9.1/gcc_64/qml'
6+
'qt_deps_unpack_dir': '/tmp/Qt5.9-gcc_64/5.9.3'
7+
'qt_deps_bin_unpack_dir': '/tmp/Qt5.9-gcc_64/5.9.3/gcc_64/bin'
8+
'qt_deps_lib_unpack_dir': '/tmp/Qt5.9-gcc_64/5.9.3/gcc_64/lib'
9+
'qt_deps_plugins_unpack_dir': '/tmp/Qt5.9-gcc_64/5.9.3/gcc_64/plugins'
10+
'qt_deps_qml_unpack_dir': '/tmp/Qt5.9-gcc_64/5.9.3/gcc_64/qml'
1111

1212
'project_root_dir': '/vagrant'
1313

@@ -20,4 +20,4 @@ configs:
2020
'spec': 'linux-g++-64'
2121
'shadow_build_dir': '/vagrant/shadow-build'
2222
'pro': '/vagrant/qgroundcontrol.pro'
23-
'deps_url': 'https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.9.1-linux-vagrant.tar.bz2'
23+
'deps_url': 'https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.9.3-gcc_64-min.tar.bz2'

Vagrantfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ Vagrant.configure(2) do |config|
4545

4646
$config_shell = <<-'SHELL'
4747
set -e
48+
set -x
4849
4950
export %{build_env}
5051
export JOBS=$((`cat /proc/cpuinfo | grep -c ^processor`+1))

0 commit comments

Comments
 (0)