Android build fixes

This commit is contained in:
Tobias Fella 2020-04-28 21:32:24 +02:00
parent da32b248df
commit 1ab02966d5
4 changed files with 7 additions and 2 deletions

View File

@ -24,6 +24,7 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons Syndication C
if (ANDROID) if (ANDROID)
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Svg) find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Svg)
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Kirigami2) find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Kirigami2)
find_package(OpenSSL REQUIRED)
else() else()
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Widgets) find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Widgets)
endif() endif()

View File

@ -7,7 +7,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.kde.alligator" package="org.kde.alligator"
android:versionName="0.0.1" android:versionName="0.0.1"
android:versionCode="1587578760" android:versionCode="1588098483"
android:installLocation="auto"> android:installLocation="auto">
<application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="Alligator" android:icon="@drawable/alligator"> <application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="Alligator" android:icon="@drawable/alligator">
<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation"
@ -56,4 +56,7 @@
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28"/> <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28"/>
<supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/> <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
</manifest> </manifest>

View File

@ -16,6 +16,7 @@ if(ANDROID)
target_link_libraries(alligator PRIVATE target_link_libraries(alligator PRIVATE
KF5::Kirigami2 KF5::Kirigami2
Qt5::Svg Qt5::Svg
OpenSSL::SSL
) )
kirigami_package_breeze_icons(ICONS kirigami_package_breeze_icons(ICONS

View File

@ -33,7 +33,7 @@ Kirigami.ScrollablePage {
property var url property var url
property var image property var image
property var all: page.feedData.url === "all" property var all: page.url === "all"
contextualActions: [ contextualActions: [
Kirigami.Action { Kirigami.Action {