diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-26 10:51:21 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-26 10:52:32 +0100 |
commit | 63a74f21a96ea5ba6a8cef7431217108ef936efe (patch) | |
tree | 33ac76fa8c5331d69a44d03241ab401535160527 | |
parent | 479d2904b452927f17d30a4f094320251111f77e (diff) | |
parent | 4c93e932a5111e222ce196ea8a1b215bf8e96e2e (diff) |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I3e500fcdf0bf7a04bdd753ceae5626ab8a443e17
8 files changed, 27 insertions, 24 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> diff --git a/examples/androidextras/notification/android-sources/src/org/qtproject/example/notification/NotificationClient.java b/examples/androidextras/notification/android-sources/src/org/qtproject/example/notification/NotificationClient.java index 9901fda..a03cae2 100644 --- a/examples/androidextras/notification/android-sources/src/org/qtproject/example/notification/NotificationClient.java +++ b/examples/androidextras/notification/android-sources/src/org/qtproject/example/notification/NotificationClient.java @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtWinExtras module of the Qt Toolkit. +** This file is part of the QtAndroidExtras module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/examples/androidextras/notification/main.cpp b/examples/androidextras/notification/main.cpp index 8ed8d30..036ae4c 100644 --- a/examples/androidextras/notification/main.cpp +++ b/examples/androidextras/notification/main.cpp @@ -1,10 +1,9 @@ - /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtWinExtras module of the Qt Toolkit. +** This file is part of the QtAndroidExtras module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/examples/androidextras/notification/notification.pro b/examples/androidextras/notification/notification.pro index 8459599..5a26740 100644 --- a/examples/androidextras/notification/notification.pro +++ b/examples/androidextras/notification/notification.pro @@ -1,10 +1,6 @@ QT += quick androidextras ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android-sources -ANDROID_PACKAGE = org.qtproject.example.notification -ANDROID_MINIMUM_VERSION = 16 -ANDROID_TARGET_VERSION = 16 -ANDROID_APP_NAME = Qt Notifier SOURCES += \ main.cpp \ diff --git a/examples/androidextras/notification/notificationclient.cpp b/examples/androidextras/notification/notificationclient.cpp index 81f80b8..3d4e487 100644 --- a/examples/androidextras/notification/notificationclient.cpp +++ b/examples/androidextras/notification/notificationclient.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtWinExtras module of the Qt Toolkit. +** This file is part of the QtAndroidExtras module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/examples/androidextras/notification/notificationclient.h b/examples/androidextras/notification/notificationclient.h index 6b48fc7..393a291 100644 --- a/examples/androidextras/notification/notificationclient.h +++ b/examples/androidextras/notification/notificationclient.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtWinExtras module of the Qt Toolkit. +** This file is part of the QtAndroidExtras module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/examples/androidextras/notification/qml/main.qml b/examples/androidextras/notification/qml/main.qml index e265f1b..8dde657 100644 --- a/examples/androidextras/notification/qml/main.qml +++ b/examples/androidextras/notification/qml/main.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtWinExtras module of the Qt Toolkit. +** This file is part of the QtAndroidExtras module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/androidextras/doc/qtandroidextras.qdocconf b/src/androidextras/doc/qtandroidextras.qdocconf index 16ed611..91d7488 100644 --- a/src/androidextras/doc/qtandroidextras.qdocconf +++ b/src/androidextras/doc/qtandroidextras.qdocconf @@ -34,6 +34,9 @@ sourcedirs += .. exampledirs += ../../../examples/androidextras \ snippets +# Specify example install dir under QT_INSTALL_EXAMPLES +examplesinstallpath = androidextras + imagedirs += images navigation.landingpage = "Qt Android Extras" navigation.cppclassespage = "Qt Android Extras C++ Classes" |