mirror of
https://github.com/tumic0/GPXSee.git
synced 2025-02-21 18:20:47 +01:00
Compare commits
No commits in common. "ec68557de5ad982554ed0990d4c940308479cdc3" and "e8b1ce2c2951c778da7250198dda8b4b4219d845" have entirely different histories.
ec68557de5
...
e8b1ce2c29
13
.github/workflows/android.yml
vendored
13
.github/workflows/android.yml
vendored
@ -11,11 +11,10 @@ jobs:
|
|||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v2
|
||||||
- name: set up JDK 11
|
- name: set up JDK 11
|
||||||
uses: actions/setup-java@v3
|
uses: actions/setup-java@v1
|
||||||
with:
|
with:
|
||||||
distribution: 'zulu'
|
|
||||||
java-version: '11'
|
java-version: '11'
|
||||||
- name: Setup Android SDK
|
- name: Setup Android SDK
|
||||||
uses: android-actions/setup-android@v2
|
uses: android-actions/setup-android@v2
|
||||||
@ -23,18 +22,16 @@ jobs:
|
|||||||
run: ${ANDROID_HOME}/tools/bin/sdkmanager --update
|
run: ${ANDROID_HOME}/tools/bin/sdkmanager --update
|
||||||
- name: Install android platform, platform-tools, build-tools and ndk
|
- 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"
|
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: Setup NDK path
|
|
||||||
run: echo "ANDROID_NDK_ROOT=${ANDROID_HOME}/ndk/22.1.7171670/" >> $GITHUB_ENV
|
|
||||||
- name: Install Qt (Desktop)
|
- name: Install Qt (Desktop)
|
||||||
uses: jurplel/install-qt-action@v2
|
uses: jurplel/install-qt-action@v2
|
||||||
with:
|
with:
|
||||||
aqtversion: '==2.1.0'
|
aqtversion: '==2.1.0'
|
||||||
version: '6.3.1'
|
version: '6.3.0'
|
||||||
- name: Install Qt (Android)
|
- name: Install Qt (Android)
|
||||||
uses: jurplel/install-qt-action@v2
|
uses: jurplel/install-qt-action@v2
|
||||||
with:
|
with:
|
||||||
aqtversion: '==2.1.0'
|
aqtversion: '==2.1.0'
|
||||||
version: '6.3.1'
|
version: '6.3.0'
|
||||||
target: 'android'
|
target: 'android'
|
||||||
arch: 'android_armv7'
|
arch: 'android_armv7'
|
||||||
modules: qtpositioning qt5compat
|
modules: qtpositioning qt5compat
|
||||||
@ -43,7 +40,7 @@ jobs:
|
|||||||
- name: Create localization
|
- name: Create localization
|
||||||
run: lrelease gpxsee.pro
|
run: lrelease gpxsee.pro
|
||||||
- name: Configure build
|
- name: Configure build
|
||||||
run: qmake gpxsee.pro OPENSSL_PATH=android_openssl
|
run: qmake gpxsee.pro OPENSSL_PATH=android_openssl
|
||||||
- name: Build project
|
- name: Build project
|
||||||
run: make -j2 apk
|
run: make -j2 apk
|
||||||
- name: Upload artifacts
|
- name: Upload artifacts
|
||||||
|
@ -11,7 +11,7 @@ GPS log file formats.
|
|||||||
* Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases,
|
* Offline maps (MBTiles, OziExplorer maps, TrekBuddy maps/atlases,
|
||||||
Garmin IMG/GMAP & JNX maps, TwoNav RMaps, GeoTIFF images, BSB charts, KMZ maps,
|
Garmin IMG/GMAP & JNX maps, TwoNav RMaps, GeoTIFF images, BSB charts, KMZ maps,
|
||||||
AlpineQuest maps, Locus/OsmAnd/RMaps SQLite maps, Mapsforge vector maps,
|
AlpineQuest maps, Locus/OsmAnd/RMaps SQLite maps, Mapsforge vector maps,
|
||||||
QCT maps, GEMF maps, Osmdroid SQLite maps, ESRI World-File georeferenced images).
|
QCT maps, ESRI World-File georeferenced images).
|
||||||
* Elevation, speed, heart rate, cadence, power, temperature and gear ratio/shifts
|
* Elevation, speed, heart rate, cadence, power, temperature and gear ratio/shifts
|
||||||
graphs.
|
graphs.
|
||||||
* Support for DEM files (SRTM HGT).
|
* Support for DEM files (SRTM HGT).
|
||||||
|
@ -506,8 +506,7 @@ win32 {
|
|||||||
icons/formats/omd.ico \
|
icons/formats/omd.ico \
|
||||||
icons/formats/ghp.ico \
|
icons/formats/ghp.ico \
|
||||||
icons/formats/qct.ico \
|
icons/formats/qct.ico \
|
||||||
icons/formats/trk.ico \
|
icons/formats/trk.ico
|
||||||
icons/formats/gemf.ico
|
|
||||||
DEFINES += _USE_MATH_DEFINES \
|
DEFINES += _USE_MATH_DEFINES \
|
||||||
NOGDI
|
NOGDI
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user