Skip to content
This repository has been archived by the owner on May 17, 2024. It is now read-only.

Update to QT 5.12.4 #27

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update to QT 5.12.4 #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ec85d49
check debug directory
homdx Aug 9, 2019
ed3d726
quiet wget and remove after setup
homdx Aug 9, 2019
7512f8b
fix - added missing so to apk
homdx Aug 10, 2019
e3b5b10
Revert "fix - added missing so to apk"
homdx Aug 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions bin/build-android-gradle-project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,14 @@ then
APK=${ANDROID_BUILD_PATH}/build/outputs/apk/android-build-debug.apk
fi

APK2=${ANDROID_BUILD_PATH}/build/outputs/apk/debug/android-build-release-signed.apk

if [ ! -f $APK2 ]
then
APK=${ANDROID_BUILD_PATH}/build/outputs/apk/debug/android-build-debug.apk
fi


echo "Output APK: $APK"

if [ ! -z "$JARSIGNER" ]
Expand Down
4 changes: 3 additions & 1 deletion recipes/install-qt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

QT_VERSION=${1:-5.12.0}
QT_TARGET_CATALOG=${2:-$PWD}
QT_CI_DOWNLOADER=${QT_CI_DOWNLOADER:-"wget -c -N"}
QT_CI_DOWNLOADER=${QT_CI_DOWNLOADER:-"wget --quiet -c -N"}

if [ "$(uname)" = "Darwin" ]; then
DOWNLOAD_URL=https://download.qt.io/archive/qt/$(echo ${QT_VERSION} | cut -d "." -f -2)/${QT_VERSION}/qt-opensource-mac-x64-${QT_VERSION}.dmg
Expand Down Expand Up @@ -41,3 +41,5 @@ elif [ -d "${QT_TARGET_CATALOG}/Qt/$(echo ${QT_VERSION} | cut -d "." -f -2)/${CO
echo "export PATH=${QT_TARGET_CATALOG}/Qt/$(echo ${QT_VERSION} | cut -d "." -f -2)/${COMPILER}/bin:$PATH" > ${ENVFILE}
fi

echo Remove downloaded file
rm -fv /qt-opensource-*.run