1
0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-30 22:51:16 +01:00

Compare commits

...

9 Commits

3 changed files with 11 additions and 7 deletions

View File

@ -11,10 +11,11 @@ jobs:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: set up JDK 11 - name: set up JDK 11
uses: actions/setup-java@v1 uses: actions/setup-java@v3
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
@ -22,16 +23,18 @@ 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.0' version: '6.3.1'
- 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.0' version: '6.3.1'
target: 'android' target: 'android'
arch: 'android_armv7' arch: 'android_armv7'
modules: qtpositioning qt5compat modules: qtpositioning qt5compat

View File

@ -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, ESRI World-File georeferenced images). QCT maps, GEMF maps, Osmdroid SQLite 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).

View File

@ -506,7 +506,8 @@ 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
} }