Commit 3ad9398f authored by camilo higuita's avatar camilo higuita

Merge branch 'android' into 'master'

Fix Android build

See merge request kde/nota!1
parents bcafa433 8ce2c7d3
<?xml version="1.0"?>
<manifest package="org.kde.nota" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto">
<application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="nota" android:icon="@drawable/icon">
<application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="nota">
<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="nota" android:screenOrientation="unspecified" android:launchMode="singleTop">
android:name=&quot;com.example.android.tools.NotificationClient&quot;
......@@ -120,7 +120,7 @@
</application>
<uses-sdk android:minSdkVersion="19"/>
<uses-sdk android:minSdkVersion="21"/>
<supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
<!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
......
......@@ -5,7 +5,8 @@ find_package(ECM 1.7.0 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${ECM_MODULE_PATH})
find_package(MauiKit REQUIRED)
find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Qml Quick Sql Svg QuickControls2 Widgets)
find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Qml Quick Sql Svg QuickControls2 Widgets Xml)
find_package(KF5 ${KF5_VERSION} REQUIRED COMPONENTS I18n Notifications Config KIO Attica SyntaxHighlighting)
include(KDEInstallDirs)
include(KDECompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings)
......@@ -21,7 +22,7 @@ set(nota_SRCS
)
set(nota_HDRS
)
set(nota_ASSETS
......@@ -36,21 +37,15 @@ add_executable(nota
)
if (ANDROID)
find_package(Qt5 REQUIRED COMPONENTS AndroidExtras)
find_package(Qt5 REQUIRED COMPONENTS AndroidExtras WebView)
target_link_libraries(vvave Qt5::AndroidExtras)
# kde_source_files_enable_exceptions(pix src/pix.cpp)
else()
find_package(KF5 ${KF5_VERSION} REQUIRED COMPONENTS I18n Notifications Config KIO Attica)
target_link_libraries(nota MauiKit Qt5::AndroidExtras)
else()
find_package(Qt5 REQUIRED COMPONENTS WebEngine)
# target_link_libraries(nota KF5::ConfigCore KF5::Notifications KF5::KIOCore KF5::I18n KF5::Attica)
endif()
if (TARGET create-apk-nota)
set_target_properties(create-apk-nota PROPERTIES ANDROID_APK_DIR "${MAUIKIT_ANDROID_DIR}")
endif()
target_link_libraries(nota Qt5::Sql Qt5::Qml Qt5::Widgets Qt5::Svg)
install(TARGETS nota ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
......
......@@ -15,7 +15,7 @@
#include "3rdparty/mauikit/src/mauikit.h"
#endif
int main(int argc, char *argv[])
Q_DECL_EXPORT int main(int argc, char *argv[])
{
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment