From 1ab02966d5dc860738d30341b580dca705ecdd08 Mon Sep 17 00:00:00 2001 From: Tobias Fella Date: Tue, 28 Apr 2020 21:32:24 +0200 Subject: [PATCH] Android build fixes --- CMakeLists.txt | 1 + android/AndroidManifest.xml | 5 ++++- src/CMakeLists.txt | 1 + src/qml/EntryListPage.qml | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d037dc7..dcc4b578 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,6 +24,7 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons Syndication C if (ANDROID) find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Svg) find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Kirigami2) + find_package(OpenSSL REQUIRED) else() find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Widgets) endif() diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 9ad3c7ee..4e7bcefd 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -7,7 +7,7 @@ + + + diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cb9d1498..7892c3e0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -16,6 +16,7 @@ if(ANDROID) target_link_libraries(alligator PRIVATE KF5::Kirigami2 Qt5::Svg + OpenSSL::SSL ) kirigami_package_breeze_icons(ICONS diff --git a/src/qml/EntryListPage.qml b/src/qml/EntryListPage.qml index 39b22e7c..a0589a65 100644 --- a/src/qml/EntryListPage.qml +++ b/src/qml/EntryListPage.qml @@ -33,7 +33,7 @@ Kirigami.ScrollablePage { property var url property var image - property var all: page.feedData.url === "all" + property var all: page.url === "all" contextualActions: [ Kirigami.Action {