1
0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-24 11:45:53 +01:00

Compare commits

..

No commits in common. "0c5076eaaf01c9c2ff6651149a5e4217058c551b" and "d04c070fe1d76b4757f319d66f9581a0239e7b6e" have entirely different histories.

7 changed files with 8 additions and 11 deletions

View File

@ -26,12 +26,12 @@ jobs:
- name: Setup NDK path
run: echo "ANDROID_NDK_ROOT=${ANDROID_HOME}/ndk/23.1.7779620/" >> $GITHUB_ENV
- name: Install Qt (Desktop)
uses: jurplel/install-qt-action@v3
uses: jurplel/install-qt-action@v2
with:
aqtversion: '==2.1.0'
version: '6.4.0'
- name: Install Qt (Android)
uses: jurplel/install-qt-action@v3
uses: jurplel/install-qt-action@v2
with:
aqtversion: '==2.1.0'
version: '6.4.0'
@ -47,7 +47,7 @@ jobs:
- name: Build project
run: make -j2 apk
- name: Upload artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v2
with:
name: GPXSee-armv7.apk
path: android-build/build/outputs/apk/debug/android-build-debug.apk

View File

@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v2
- name: Install dependencies
run: |
sudo apt-get update

View File

@ -13,7 +13,7 @@ jobs:
- name: Set environment variables
run: echo "PATH=/usr/local/opt/qt@5/bin:$PATH" >> $GITHUB_ENV
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v2
- name: Install dependencies
run: brew install qt5
- name: Create localization
@ -25,7 +25,7 @@ jobs:
- name: Create DMG
run: macdeployqt GPXSee.app -dmg
- name: Upload artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v2
with:
name: GPXSee-qt5.dmg
path: GPXSee.dmg
@ -37,7 +37,7 @@ jobs:
- name: Set environment variables
run: echo "PATH=/usr/local/opt/qt@6/bin:$PATH" >> $GITHUB_ENV
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v2
- name: Install dependencies
run: brew install qt6
- name: Create localization
@ -49,7 +49,7 @@ jobs:
- name: Create DMG
run: macdeployqt GPXSee.app -dmg
- name: Upload artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v2
with:
name: GPXSee-qt6.dmg
path: GPXSee.dmg

View File

@ -173,7 +173,6 @@
<file alias="platform.png">icons/map/marine/platform.png</file>
<file alias="ferry-line.png">icons/map/marine/ferry-line.png</file>
<file alias="dw-route-line.png">icons/map/marine/dw-route-line.png</file>
<file alias="fence-line.png">icons/map/marine/fence-line.png</file>
</qresource>
<!-- Mapsforge rendertheme -->

Binary file not shown.

Before

Width:  |  Height:  |  Size: 124 B

View File

@ -32,7 +32,6 @@
#define DMPGRD 48
#define DYKCON 49
#define FAIRWY 51
#define FNCLNE 52
#define FERYRT 53
#define FLODOC 57
#define GATCON 61

View File

@ -114,7 +114,6 @@ void Style::defaultLineStyle()
_lines[SUBTYPE(RCRTCL, 2)] = Line(QPen(QColor("#eb49eb"), 0, Qt::DashLine));
_lines[TYPE(FAIRWY)] = Line(QPen(QColor("#888888"), 1, Qt::DashDotDotLine));
_lines[TYPE(BERTHS)] = Line(QPen(QColor("#333333"), 2));
_lines[TYPE(FNCLNE)] = Line(QImage(":/marine/fence-line.png"));
}
void Style::defaultPointStyle()