Merge branch 'v1.17-dev'

.travis.yml

@@ -1,5 +1,5 @@
 sudo: required
-dist: trusty
+dist: xenial
 language: cpp
 cache: ccache
 
@@ -44,7 +44,7 @@ jobs:
     # the actual compilin'
     - stage: Linux
       os: linux
-      env: JOB=build-ubuntu-14-04
+      env: JOB=build-ubuntu-16-04
       script: "./.travis/$JOB.sh"
     - stage: "Windows Stage 1: Dependencies (OpenSSL, Qt)"
       os: linux

.travis/build-ubuntu-16-04.sh

@@ -19,8 +19,6 @@
 # stop as soon as one of steps will fail
 set -e -o pipefail
 
-# Qt 5.5, since that's the lowest supported version
-sudo add-apt-repository -y ppa:beineri/opt-qt551-trusty
 sudo apt-get update -qq
 
 # install needed Qt, OpenAL, opus, qrencode, GTK tray deps, sqlcipher
@@ -43,16 +41,13 @@ sudo apt-get install -y --force-yes \
     libtool \
     libvpx-dev \
     libxss-dev qrencode \
-    qt55base \
-    qt55script \
-    qt55svg \
-    qt55tools \
-    qt55xmlpatterns \
+    qt5-default \
+    qttools5-dev-tools \
+    qttools5-dev \
+    libqt5opengl5-dev \
+    libqt5svg5-dev \
     pkg-config || yes
 
-# Qt
-source /opt/qt55/bin/qt55-env.sh || yes
-
 # ffmpeg
 if [ ! -e "libs" ]; then mkdir libs; fi
 if [ ! -e "ffmpeg" ]; then mkdir ffmpeg; fi

.travis/build-windows.sh

@@ -108,6 +108,11 @@ ls -lbh "$CACHE_DIR"
 # Purely for debugging
 ls -lbh "$PWD"
 
+sudo apt-get update -qq
+# even though we're building in docker, libseccomp2 is used by docker, and needs to be up to date
+# to support functionality used by Qt's configure
+sudo apt-get install libseccomp2 -y --force-yes
+
 # Build
 sudo docker run --rm \
                 -v "$PWD/workspace":/workspace \

tools/update-toxcore-version.sh

@@ -60,7 +60,7 @@ update_flatpak() {
 
 update_travis() {
     cd .travis
-    perl -i -0pe "s|$VERSION_PATTERN( --depth=1 https://github.com/toktok/c-toxcore)|$@\${1}|gms" build-ubuntu-14-04.sh
+    perl -i -0pe "s|$VERSION_PATTERN( --depth=1 https://github.com/toktok/c-toxcore)|$@\${1}|gms" build-ubuntu-16-04.sh
     cd ..
 }