mirror of
https://invent.kde.org/graphics/okular
synced 2024-10-01 05:33:33 +00:00
Merge branch okular:master into work/hires_wheel_page_scroll_rework
This commit is contained in:
commit
10b0e0cfd9
|
@ -31,6 +31,7 @@ include(ECMAddTests)
|
|||
include(ECMAddAppIcon)
|
||||
include(CMakePackageConfigHelpers)
|
||||
include(ECMSetupQtPluginMacroNames)
|
||||
include(ECMAddAndroidApk)
|
||||
|
||||
if (ANDROID AND (FORCE_NOT_REQUIRED_DEPENDENCIES STREQUAL ""))
|
||||
set(FORCE_NOT_REQUIRED_DEPENDENCIES "KF6Wallet;KF6DocTools;Qt6Qml;TIFF;LibSpectre;KExiv2Qt6;CHM;LibZip;DjVuLibre;EPub;Discount;")
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
|
||||
<application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="Okular" android:icon="@drawable/icon" android:extractNativeLibs="true">
|
||||
<application android:name="org.qtproject.qt.android.bindings.QtApplication" android:label="Okular" android:icon="@drawable/icon" android:extractNativeLibs="true">
|
||||
<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation"
|
||||
android:name="org.kde.something.OpenFileActivity"
|
||||
android:label="Okular"
|
||||
|
|
|
@ -10,7 +10,7 @@ import android.app.Activity;
|
|||
|
||||
import java.io.FileNotFoundException;
|
||||
|
||||
import org.qtproject.qt5.android.bindings.QtActivity;
|
||||
import org.qtproject.qt.android.bindings.QtActivity;
|
||||
|
||||
class FileClass
|
||||
{
|
||||
|
|
|
@ -42,6 +42,8 @@ if (ANDROID)
|
|||
view-preview
|
||||
view-table-of-contents-ltr
|
||||
)
|
||||
|
||||
ecm_add_android_apk(okularkirigami ANDROID_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../android)
|
||||
endif()
|
||||
|
||||
install(TARGETS okularkirigami ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
|
|
Loading…
Reference in a new issue