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

Compare commits

...

5 Commits

9 changed files with 28 additions and 18 deletions

View File

@ -1,4 +1,4 @@
version: 13.15.{build} version: 13.16.{build}
configuration: configuration:
- Release - Release

View File

@ -8,12 +8,12 @@ on:
jobs: jobs:
build: build:
name: GPXSee name: GPXSee
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: set up JDK 11 - name: set up JDK 11
uses: actions/setup-java@v3 uses: actions/setup-java@v4
with: with:
distribution: 'temurin' distribution: 'temurin'
java-version: '11' java-version: '11'
@ -47,7 +47,7 @@ jobs:
- name: Build project - name: Build project
run: make -j2 apk run: make -j2 apk
- name: Upload artifacts - name: Upload artifacts
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: GPXSee-arm64_v8a.apk name: GPXSee-arm64_v8a.apk
path: android-build/build/outputs/apk/debug/android-build-debug.apk path: android-build/build/outputs/apk/debug/android-build-debug.apk

View File

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

View File

@ -11,7 +11,7 @@ jobs:
runs-on: macos-latest runs-on: macos-latest
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v3 uses: jurplel/install-qt-action@v3
with: with:
@ -25,7 +25,7 @@ jobs:
- name: Create DMG - name: Create DMG
run: macdeployqt GPXSee.app -dmg -appstore-compliant run: macdeployqt GPXSee.app -dmg -appstore-compliant
- name: Upload artifacts - name: Upload artifacts
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: GPXSee-qt5.dmg name: GPXSee-qt5.dmg
path: GPXSee.dmg path: GPXSee.dmg
@ -35,7 +35,7 @@ jobs:
runs-on: macos-latest runs-on: macos-latest
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v3 uses: jurplel/install-qt-action@v3
with: with:
@ -50,7 +50,7 @@ jobs:
- name: Create DMG - name: Create DMG
run: macdeployqt GPXSee.app -dmg -appstore-compliant run: macdeployqt GPXSee.app -dmg -appstore-compliant
- name: Upload artifacts - name: Upload artifacts
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: GPXSee-qt6.dmg name: GPXSee-qt6.dmg
path: GPXSee.dmg path: GPXSee.dmg

View File

@ -3,7 +3,7 @@ unix:!macx:!android {
} else { } else {
TARGET = GPXSee TARGET = GPXSee
} }
VERSION = 13.15 VERSION = 13.16
QT += core \ QT += core \

View File

@ -12,7 +12,7 @@ public class Activity extends org.qtproject.qt.android.bindings.QtActivity
public String intentPath() public String intentPath()
{ {
String path = ""; String path = null;
Intent intent = getIntent(); Intent intent = getIntent();
if (intent != null) { if (intent != null) {

View File

@ -37,7 +37,7 @@ Unicode true
; The name of the installer ; The name of the installer
Name "GPXSee" Name "GPXSee"
; Program version ; Program version
!define VERSION "13.15" !define VERSION "13.16"
; The file to write ; The file to write
OutFile "GPXSee-${VERSION}_x64.exe" OutFile "GPXSee-${VERSION}_x64.exe"

View File

@ -5,7 +5,6 @@
#include <QNetworkProxyFactory> #include <QNetworkProxyFactory>
#include <QNetworkAccessManager> #include <QNetworkAccessManager>
#include <QLibraryInfo> #include <QLibraryInfo>
#include <QSurfaceFormat>
#include <QImageReader> #include <QImageReader>
#include <QFileInfo> #include <QFileInfo>
#ifdef Q_OS_ANDROID #ifdef Q_OS_ANDROID
@ -58,10 +57,6 @@ App::App(int &argc, char **argv) : QApplication(argc, argv)
"QThreadStorage: Thread X exited after QThreadStorage Y destroyed" */ "QThreadStorage: Thread X exited after QThreadStorage Y destroyed" */
Downloader::setNetworkManager(new QNetworkAccessManager(this)); Downloader::setNetworkManager(new QNetworkAccessManager(this));
DEM::setDir(ProgramPaths::demDir()); DEM::setDir(ProgramPaths::demDir());
QSurfaceFormat fmt;
fmt.setStencilBufferSize(8);
fmt.setSamples(4);
QSurfaceFormat::setDefaultFormat(fmt);
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
QImageReader::setAllocationLimit(0); QImageReader::setAllocationLimit(0);
#endif // QT6 #endif // QT6

View File

@ -1,3 +1,5 @@
#include <QtGlobal>
#include <QSurfaceFormat>
#include "GUI/app.h" #include "GUI/app.h"
#include "GUI/timezoneinfo.h" #include "GUI/timezoneinfo.h"
@ -12,6 +14,19 @@ int main(int argc, char *argv[])
qRegisterMetaType<TimeZoneInfo>("TimeZoneInfo"); qRegisterMetaType<TimeZoneInfo>("TimeZoneInfo");
#endif // QT6 #endif // QT6
QSurfaceFormat fmt;
fmt.setProfile(QSurfaceFormat::CoreProfile);
#ifdef Q_OS_ANDROID
fmt.setRenderableType(QSurfaceFormat::OpenGLES);
#else // Android
fmt.setVersion(3, 2);
fmt.setRenderableType(QSurfaceFormat::OpenGL);
#endif // Android
fmt.setDepthBufferSize(24);
fmt.setStencilBufferSize(8);
fmt.setSamples(4);
QSurfaceFormat::setDefaultFormat(fmt);
App app(argc, argv); App app(argc, argv);
return app.run(); return app.run();
} }