1
0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-02-20 09:40:49 +01:00

Compare commits

..

No commits in common. "ca0089e48603c418c6bbbf132e1af998da6eb547" and "306116dbdeb41052b9606874bc4aa6f41146b0c9" have entirely different histories.

2 changed files with 1 additions and 44 deletions

View File

@ -1,41 +0,0 @@
name: Android
on:
push:
branches:
- master
jobs:
build:
name: GPXSee
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v2
- name: set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Setup Android SDK
uses: android-actions/setup-android@v2
- name: Run sdkmanager update
run: ${ANDROID_HOME}/tools/bin/sdkmanager --update
- name: Install android platform, platform-tools, build-tools and ndk
run: ${ANDROID_HOME}/tools/bin/sdkmanager --install "cmdline-tools;latest" "platform-tools" "platforms;android-31" "build-tools;31.0.0" "ndk;22.1.7171670"
- name: Install Qt (Desktop)
uses: jurplel/install-qt-action@v2
with:
aqtversion: '==2.1.0'
version: '6.3.0'
- name: Install Qt (Android)
uses: jurplel/install-qt-action@v2
with:
aqtversion: '==2.1.0'
version: '6.3.0'
target: 'android'
arch: 'android_armv7'
modules: qtpositioning qt5compat
- name: Configure build
run: qmake gpxsee.pro
- name: Build project
run: make -j2

View File

@ -545,9 +545,7 @@ android {
return($$first(vCode)$$first(suffix))
}
!include($$OPENSSL_PATH/openssl.pri) {
message("OpenSSL not found, building without HTTPS support!")
}
include($$OPENSSL_PATH/openssl.pri)
ANDROID_VERSION_NAME = $$VERSION
ANDROID_VERSION_CODE = $$versionCode($$ANDROID_VERSION_NAME)