diff options
author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2013-11-12 08:58:58 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-12 17:56:29 +0100 |
commit | 89ade43b15b60194345df37a5b9518c1335fe02f (patch) | |
tree | 01252bc3b219e14f2a03329b990b22410e7a864d /examples/androidextras/notification/android-sources | |
parent | abdb38773693745f5d2f8319b470bfbe0373cc1f (diff) |
Update AndroidManifest.xml in example
This no longer compiled because it was an old version. I guess we
have to be very careful when updating the structure of
AndroidManifest.xml after the release.
Task-number: QTBUG-34763
Change-Id: I32dfe11c83eff42a50b54327fab6d4c5d05b0829
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Diffstat (limited to 'examples/androidextras/notification/android-sources')
-rw-r--r-- | examples/androidextras/notification/android-sources/AndroidManifest.xml | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/examples/androidextras/notification/android-sources/AndroidManifest.xml b/examples/androidextras/notification/android-sources/AndroidManifest.xml index a7f10eb..ed24656 100644 --- a/examples/androidextras/notification/android-sources/AndroidManifest.xml +++ b/examples/androidextras/notification/android-sources/AndroidManifest.xml @@ -1,38 +1,43 @@ <?xml version='1.0' encoding='utf-8'?> -<manifest android:versionCode="1" package="org.qtproject.example" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="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:name="org.qtproject.example.notification.NotificationClient" android:label="@string/app_name" android:screenOrientation="unspecified" android:configChanges="orientation|locale|fontScale|keyboard|keyboardHidden|navigation"> + <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"> <intent-filter> <action android:name="android.intent.action.MAIN"/> <category android:name="android.intent.category.LAUNCHER"/> </intent-filter> + <meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/> <meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/> - <meta-data android:name="android.app.repository" android:value="@string/repository"/> + <meta-data android:name="android.app.repository" android:value="default"/> <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/> <meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/> - <meta-data android:name="android.app.lib_name" android:value="@string/app_lib_name"/> <!-- Deploy Qt libs as part of package --> - <meta-data android:name="android.app.bundle_local_qt_libs" android:value="1"/> + <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="1"/> + <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="@string/local_libs"/> - <meta-data android:name="android.app.load_local_jars" android:value="@string/local_jars"/> - <meta-data android:name="android.app.static_init_classes" android:value="@string/init_classes"/> + <meta-data android:name="android.app.load_local_libs" android:value="-- %%INSERT_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 --> - <meta-data android:name="android.app.ministro_not_found_msg" android:value="@string/ministro_not_found_msg"/> - <meta-data android:name="android.app.ministro_needed_msg" android:value="@string/ministro_needed_msg"/> - <meta-data android:name="android.app.fatal_error_msg" android:value="@string/fatal_error_msg"/> + <meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/> + <meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/> + <meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/> <!-- Messages maps --> <!-- Splash screen --> <meta-data android:name="android.app.splash_screen" android:resource="@layout/splash"/> <!-- Splash screen --> </activity> </application> - <!-- %%INSERT_USES_SDK%% --> - <supports-screens android:normalScreens="true" android:anyDensity="true" android:smallScreens="true" android:largeScreens="true"/> + <uses-sdk android:minSdkVersion="16" /> + <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/> + <!-- %%INSERT_PERMISSIONS --> <uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> + <!-- %%INSERT_FEATURES --> </manifest> |