From 4dbb6774be878b1411fc8ade8700b9d3715c726f Mon Sep 17 00:00:00 2001
From: Skycoder42 <Skycoder42@users.noreply.github.com>
Date: Thu, 24 May 2018 10:46:31 +0200
Subject: [PATCH] update to 5.11

---
 .travis.yml  | 11 ++++++-----
 appveyor.yml |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8a60647..723ff00 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,12 +5,12 @@ services:
 
 sudo: required
 dist: trusty
-osx_image: xcode9.2
+osx_image: xcode9.3
 
 env:
   global:
     - QPMX_CACHE_DIR=$HOME/.qpmx-cache
-    - QT_VER=5.10.1
+    - QT_VER=5.11.0
     - DOCKER_IMAGE=base
 
 matrix:
@@ -35,11 +35,11 @@ matrix:
 
 install:
   - git clone https://github.com/Skycoder42/QtModules.git ./qtmodules-travis
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then travis_wait 40 ./qtmodules-travis/ci/$TRAVIS_OS_NAME/setup.sh; else ./qtmodules-travis/ci/$TRAVIS_OS_NAME/setup.sh; fi
+  - travis_wait 40 ./qtmodules-travis/ci/$TRAVIS_OS_NAME/setup.sh
 
 script:
   - echo "CONFIG += libpng_static" >> .qmake.conf
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then sudo chmod -R a+rwx /opt/qt/$QT_VER/$PLATFORM/plugins/imageformats && touch /opt/qt/$QT_VER/$PLATFORM/plugins/imageformats/test.txt; fi
+  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then sudo chmod -R a+rwx /opt/qt/$QT_VER/$PLATFORM/plugins/imageformats; fi
   - ./qtmodules-travis/ci/$TRAVIS_OS_NAME/build.sh
 
 before_deploy:
@@ -50,7 +50,7 @@ deploy:
   api_key:
     secure: rcdY0c8fX3oxFqMLGGBiAt7Dv4M/eJsHLCPYAE9V/ItEzbvGvnUnoAsZXBEZszTgIeIGqTcIjnYnmQ0dl4f54dDfeW29DAiurpWT+dZ228A1SyFD7FVz1PzSbtagHLdaV2cWT/ez8wKWgEyEVDEgam7o2O0O+W91jQZO74YEYfHmj+Hro0C3fMqFXDwY7phL/G1MGY9P2lwU0Uoo+0OrV/42RhjFoKPG7kN2RMd/Z91jlhWyBQZvBQZ9aOiGQyRe0Y9tNjnhpSbuEbZp/jSlR62Nf0ZGmCm0lSxtH/G1Y/l4bzvknHvP4k0hg91E93IQLbSkuXCOeVa3/ghgN0m9gL+S1OVGOOftEeXQOCVI14IMkmv0vC5VdzfVY/dIFwFJG20uLylFEz/RupLZEmg7JONUJvbJYl5ABP9End2HScM2E+GDlvSHeoPbSX2hcKqcxZy5mIWdc5ie7s4m/ft1aRAryMEwGf3TbwMQRC8oLkJ9p3COPKPqKwqolLHv4wR1ei7p2caldtygfcv/JEK+jZwyox6m8YJkcI4D1rolNGmXCt1Btn1BkotH9p6oHsG18unspcY+r2IZVNhM+INegOnlzMRku0WoEuh02Qrv79lKfQ8Kw4sZhhL58Iy/K/7rQ8hM2fH+ODb5OT6w4htRolimkMV9HOsDjLPqc2u8h+A=
   file_glob: true
-  file: install/opt/build_*_$QT_VER.tar.xz
+  file: install/build_*_$QT_VER.tar.xz
   on:
     repo: Skycoder42/qapng
     tags: true
@@ -59,6 +59,7 @@ before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
   - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
   - rm -fr $QPMX_CACHE_DIR/locks
+  - rm -fr $QPMX_CACHE_DIR/tmp
 cache:
   directories:
     - $HOME/.gradle/caches/
diff --git a/appveyor.yml b/appveyor.yml
index 22c25b7..4d05059 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,7 +5,7 @@ image:
 version: build-{build}
 
 environment:
-  QT_VER: 5.10.1
+  QT_VER: 5.11.0
 
   matrix:
     - PLATFORM: msvc2017_64