aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>2019-10-25 08:34:15 +0200
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>2019-10-25 09:05:43 +0200
commite778807d66eaff9112f92009b76e4ff35d03204b (patch)
tree2adff1eb23cd3c8e370f2c8a7b9f147e46dc3e4c
parent9f63386339a69358f61f30ffa17a9c8ae3ec9b98 (diff)
Update AndroidManifest.xml to be compatible with Qt 5.14
There are changes in Qt 5.14 which require updating the manifests of all applications unfortunately, otherwise they will not work. This fixes the manifest for the Notification example. Change-Id: Ia91972f87df412fcb89a2f002dee9a0b94adb004 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
-rw-r--r--examples/androidextras/notification/android-sources/AndroidManifest.xml15
1 files changed, 5 insertions, 10 deletions
diff --git a/examples/androidextras/notification/android-sources/AndroidManifest.xml b/examples/androidextras/notification/android-sources/AndroidManifest.xml
index e7820e1..2434bbb 100644
--- a/examples/androidextras/notification/android-sources/AndroidManifest.xml
+++ b/examples/androidextras/notification/android-sources/AndroidManifest.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0"?>
<manifest package="org.qtproject.example.notification" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto">
- <application android:icon="@drawable/icon" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="@string/app_name">
- <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation"
- android:name="org.qtproject.example.notification.NotificationClient"
- android:label="Qt Notifier"
- android:screenOrientation="unspecified">
+ <application android:icon="@drawable/icon" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="@string/app_name" android:hardwareAccelerated="true" android:extractNativeLibs="true">
+ <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density" android:name="org.qtproject.example.notification.NotificationClient" android:label="Qt Notifier" android:screenOrientation="unspecified" android:launchMode="singleTop">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
@@ -16,12 +13,10 @@
<meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
<!-- Deploy Qt libs as part of package -->
<meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/>
- <meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/>
- <meta-data android:name="android.app.bundled_in_assets_resource_id" android:resource="@array/bundled_in_assets"/>
<!-- Run with local libs -->
<meta-data android:name="android.app.use_local_qt_libs" android:value="-- %%USE_LOCAL_QT_LIBS%% --"/>
<meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
- <meta-data android:name="android.app.load_local_libs" android:value="-- %%INSERT_LOCAL_LIBS%% --"/>
+ <meta-data android:name="android.app.load_local_libs_resource_id" android:resource="@array/load_local_libs"/>
<meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/>
<meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/>
<!-- Messages maps -->
@@ -36,7 +31,7 @@
<!-- Splash screen -->
</activity>
</application>
- <uses-sdk android:minSdkVersion="21" />
+ <uses-sdk android:minSdkVersion="21"/>
<supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
<!-- %%INSERT_PERMISSIONS -->
<uses-permission android:name="android.permission.INTERNET"/>