mirror/brickstore
1
0
Fork 0
mirror of https://github.com/rgriebl/brickstore.git synced 2026-05-25 10:28:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

Unbreak the Android build

Browse Source
This commit is contained in:
Robert Griebl
2022-11-18 00:44:33 +01:00
parent 3c3ddfd06b
commit 833ec4792d
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build_cmake.yml
+1
View File
@@ -260,6 +260,7 @@ jobs:
${Qt6_DIR}/bin/qt-cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \
-DQT_HOST_PATH=$(readlink -f $Qt6_DIR/../gcc_64) \
-DQT_ANDROID_SDK_BUILD_TOOLS_REVISION=30.0.3 \
-DQT_ANDROID_TARGET_SDK_VERSION=31 \
-DANDROID_NATIVE_API_LEVEL=23 \
-DQT_ANDROID_BUILD_ALL_ABIS=TRUE \
-DANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk/${{ matrix.config.android_ndk }} \
CMakeLists.txt
+7 -2
View File
@@ -351,13 +351,18 @@ if (ANDROID)
QT_ANDROID_VERSION_NAME ${VERSION}
)
if (QT_ANDROID_SDK_BUILD_TOOLS_REVISION)
# Qt bug: this has to be set as a target property to stick
if (QT_ANDROID_SDK_BUILD_TOOLS_REVISION) # this has to be set as a target property to stick
set_target_properties(${PROJECT_NAME} PROPERTIES
QT_ANDROID_SDK_BUILD_TOOLS_REVISION "${QT_ANDROID_SDK_BUILD_TOOLS_REVISION}"
)
endif()
if (QT_ANDROID_TARGET_SDK_VERSION) # this has to be set as a target property to stick
set_target_properties(${PROJECT_NAME} PROPERTIES
QT_ANDROID_TARGET_SDK_VERSION "${QT_ANDROID_TARGET_SDK_VERSION}"
)
endif()
include(FetchContent)
FetchContent_Declare(
android/AndroidManifest.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<!-- %%INSERT_FEATURES -->
<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">
<activity android:name="de.brickforge.brickstore.ExtendedQtActivity" 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:theme="@style/splashScreenTheme">
<activity android:name="de.brickforge.brickstore.ExtendedQtActivity" 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:theme="@style/splashScreenTheme" android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>