use qt5.14.2

MerginMaps · Apr 23, 2020 · c33ca4d · c33ca4d
1 parent c63fc3c
commit c33ca4d
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/android/Dockerfile b/android/Dockerfile
@@ -3,7 +3,7 @@ MAINTAINER Peter Petrik <peter.petrik@lutraconsulting.co.uk>
 
 USER root
 
-ARG QT_VERSION=5.14.1
+ARG QT_VERSION=5.14.2
 ARG NDK_VERSION=r21
 ARG SDK_PLATFORM=android-29
 ARG SDK_BUILD_TOOLS=28.0.3

diff --git a/android/config.conf.default b/android/config.conf.default
@@ -5,12 +5,12 @@ export ANDROIDAPI=23 # == CMake's ANDROID_NATIVE_API_LEVEL == gradle's minSdkVer
 #### PATHS ####
 export ANDROIDSDK="/path/to/android-sdk"
 export ANDROIDNDK="/path/to/android-ndk"
-export QT_ANDROID_BASE="/path/to/qt/sdk/Qt/5.14.1"
+export QT_ANDROID_BASE="/path/to/qt/sdk/Qt/5.14.2"
 
 # For example:
 # export ANDROIDSDK="/opt/android/sdk"
 # export ANDROIDNDK="/opt/android-ndk-r21/"
-# export QT_ANDROID_BASE="/opt/Qt/5.14.1"
+# export QT_ANDROID_BASE="/opt/Qt/5.14.2"
 
 # QGIS needs a bison 3. On MacOS you may need
 # to install one with e.g. homebrew or qgis_deps

diff --git a/android/recipes/qgis/recipe.sh b/android/recipes/qgis/recipe.sh
@@ -8,10 +8,10 @@ DEPS_qgis=(zlib gdal qca libspatialindex libspatialite expat postgresql libzip q
 
 # url of the package
 # some random commit from the 20th April
-URL_qgis=https://github.com/qgis/QGIS/archive/1e4b816a14884f661895ad2d39a3a8bf6def341d.tar.gz
+URL_qgis=https://github.com/qgis/QGIS/archive/a48474d0e523b3fdc0ecae333fc70b3a80912e6c.tar.gz
 
 # md5 of the package
-MD5_qgis=e48d192ec13cdc0f70ff8ac6e948869b
+MD5_qgis=46ba567ccbd3c0844167df20c4e60b53
 
 # default build path
 BUILD_qgis=$BUILD_PATH/qgis/$(get_directory $URL_qgis)

diff --git a/ios/config.conf.default b/ios/config.conf.default
@@ -2,7 +2,7 @@
 export IOS_MIN_SDK_VERSION="12.0"
 
 #### PATHS ####
-export QT_BASE="/opt/Qt/5.14.1"
+export QT_BASE="/opt/Qt/5.14.2"
 
 # you need to use recent flex and bison
 # so you can install them with homebrew or qgis_deps

diff --git a/ios/config_rel.conf b/ios/config_rel.conf
@@ -1,4 +1,4 @@
 export IOS_MIN_SDK_VERSION="12.0"
-export QT_BASE="/opt/Qt/5.11.3"
+export QT_BASE="/opt/Qt/5.14.2"
 export PATH="/usr/local/opt/flex/bin/:/usr/local/opt/bison/bin/:${PATH}"
 export ARCHES=("arm64")
diff --git a/ios/recipes/qgis/recipe.sh b/ios/recipes/qgis/recipe.sh
@@ -7,10 +7,10 @@ VERSION_qgis=3.13
 DEPS_qgis=(protobuf libtasn1 gdal qca proj libspatialite libspatialindex expat postgresql libzip qtkeychain)
 
 # url of the package
-URL_qgis=https://github.com/qgis/QGIS/archive/1e4b816a14884f661895ad2d39a3a8bf6def341d.tar.gz
+URL_qgis=https://github.com/qgis/QGIS/archive/a48474d0e523b3fdc0ecae333fc70b3a80912e6c.tar.gz
 
 # md5 of the package
-MD5_qgis=e48d192ec13cdc0f70ff8ac6e948869b
+MD5_qgis=46ba567ccbd3c0844167df20c4e60b53
 
 # default build path
 BUILD_qgis=$BUILD_PATH/qgis/$(get_directory $URL_qgis)