diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 03:01:06 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 03:01:06 +0200 |
| commit | bf9eedf055f0a23f0137058f6618cd17246f77fb (patch) | |
| tree | 9bf236f2489e80e93c7db0aa0106e6bf888b34a2 | |
| parent | e7082b09149f174dbc82ef24993a1ced79044bdf (diff) | |
| parent | e778807d66eaff9112f92009b76e4ff35d03204b (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: If6f4ba688013fa585513bdb8218b671a739b3386
| -rw-r--r-- | examples/androidextras/notification/android-sources/AndroidManifest.xml | 15 |
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"/> |