mirror of
https://github.com/tumic0/GPXSee.git
synced 2024-11-28 05:34:47 +01:00
Compare commits
3 Commits
26d2bc4f5d
...
2abc9ae246
Author | SHA1 | Date | |
---|---|---|---|
2abc9ae246 | |||
4543311c95 | |||
7bc5021989 |
@ -11,7 +11,7 @@ environment:
|
|||||||
OPENSSLDIR: C:\OpenSSL-v111-Win64\bin
|
OPENSSLDIR: C:\OpenSSL-v111-Win64\bin
|
||||||
matrix:
|
matrix:
|
||||||
- QTDIR: C:\Qt\5.15\msvc2019_64
|
- QTDIR: C:\Qt\5.15\msvc2019_64
|
||||||
- QTDIR: C:\Qt\6.3\msvc2019_64
|
- QTDIR: C:\Qt\6.4\msvc2019_64
|
||||||
NSISDEF: /DQT6
|
NSISDEF: /DQT6
|
||||||
|
|
||||||
install:
|
install:
|
||||||
|
8
.github/workflows/android.yml
vendored
8
.github/workflows/android.yml
vendored
@ -22,19 +22,19 @@ jobs:
|
|||||||
- name: Run sdkmanager update
|
- name: Run sdkmanager update
|
||||||
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;23.1.7779620"
|
||||||
- name: Setup NDK path
|
- name: Setup NDK path
|
||||||
run: echo "ANDROID_NDK_ROOT=${ANDROID_HOME}/ndk/22.1.7171670/" >> $GITHUB_ENV
|
run: echo "ANDROID_NDK_ROOT=${ANDROID_HOME}/ndk/23.1.7779620/" >> $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.4.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.4.0'
|
||||||
target: 'android'
|
target: 'android'
|
||||||
arch: 'android_armv7'
|
arch: 'android_armv7'
|
||||||
modules: qtpositioning qt5compat
|
modules: qtpositioning qt5compat
|
||||||
|
@ -558,6 +558,7 @@ android {
|
|||||||
message("OpenSSL not found, building without HTTPS support!")
|
message("OpenSSL not found, building without HTTPS support!")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ANDROID_TARGET_SDK_VERSION = 31
|
||||||
ANDROID_VERSION_NAME = $$VERSION
|
ANDROID_VERSION_NAME = $$VERSION
|
||||||
ANDROID_VERSION_CODE = $$versionCode($$ANDROID_VERSION_NAME)
|
ANDROID_VERSION_CODE = $$versionCode($$ANDROID_VERSION_NAME)
|
||||||
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/pkg/android
|
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/pkg/android
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
<!-- %%INSERT_FEATURES -->
|
<!-- %%INSERT_FEATURES -->
|
||||||
<supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:smallScreens="true"/>
|
<supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:smallScreens="true"/>
|
||||||
<application android:name="org.qtproject.qt.android.bindings.QtApplication" android:extractNativeLibs="true" android:hardwareAccelerated="true" android:label="-- %%INSERT_APP_NAME%% --" android:requestLegacyExternalStorage="true" android:allowNativeHeapPointerTagging="false" android:icon="@drawable/icon">
|
<application android:name="org.qtproject.qt.android.bindings.QtApplication" android:extractNativeLibs="true" android:hardwareAccelerated="true" android:label="-- %%INSERT_APP_NAME%% --" android:requestLegacyExternalStorage="true" android:allowNativeHeapPointerTagging="false" android:icon="@drawable/icon">
|
||||||
<activity android:name="org.qtproject.qt.android.bindings.QtActivity" android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density" android:label="-- %%INSERT_APP_NAME%% --" android:launchMode="singleTop" android:screenOrientation="unspecified">
|
<activity android:name="org.qtproject.qt.android.bindings.QtActivity" android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density" android:label="-- %%INSERT_APP_NAME%% --" android:launchMode="singleTop" android:screenOrientation="unspecified" android:exported="true">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.MAIN"/>
|
<action android:name="android.intent.action.MAIN"/>
|
||||||
<category android:name="android.intent.category.LAUNCHER"/>
|
<category android:name="android.intent.category.LAUNCHER"/>
|
||||||
|
Loading…
Reference in New Issue
Block a user