aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAssam Boudjelthia <assam.boudjelthia@qt.io>2020-04-06 21:15:27 +0300
committerAssam Boudjelthia <assam.boudjelthia@qt.io>2020-05-25 16:30:57 +0300
commit9dc12a9289d542fabed8a30ad347ed80e471f93b (patch)
treeeadaeb12fa6322fab67aca0e2b9b8969993d7e0c /src
parentb80262f9d844b01c713c7df32754fc8194de900f (diff)
Add Android services examples
* Pure Android service in the same process. * Android Services with BroadcastReceiver with same .so file and separate .so file. * Android Service with QAndroidBinder in separate .so file. Task-number: QTBUG-83038 Change-Id: I24a4dbe4f1de56736625cfdfe2e7fc3ea4905de5 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> (cherry picked from commit c61bce34948922e006dc6c507e71dc4c82588a6c)
Diffstat (limited to 'src')
-rw-r--r--src/androidextras/doc/images/androidservices.pngbin0 -> 25680 bytes
-rw-r--r--src/androidextras/doc/qtandroidextras.qdocconf2
-rw-r--r--src/androidextras/doc/src/external-resources.qdoc64
3 files changed, 65 insertions, 1 deletions
diff --git a/src/androidextras/doc/images/androidservices.png b/src/androidextras/doc/images/androidservices.png
new file mode 100644
index 0000000..5c837f6
--- /dev/null
+++ b/src/androidextras/doc/images/androidservices.png
Binary files differ
diff --git a/src/androidextras/doc/qtandroidextras.qdocconf b/src/androidextras/doc/qtandroidextras.qdocconf
index 3ac592d..afeb5da 100644
--- a/src/androidextras/doc/qtandroidextras.qdocconf
+++ b/src/androidextras/doc/qtandroidextras.qdocconf
@@ -37,7 +37,7 @@ qhp.QtAndroidExtras.subprojects.examples.title = Examples
qhp.QtAndroidExtras.subprojects.examples.indexTitle = Qt Android Extras Examples
qhp.QtAndroidExtras.subprojects.examples.selectors = fake:example
-depends += qtcore qtdoc
+depends += qtcore qtdoc qtqml
headerdirs += ..
sourcedirs += ..
exampledirs += ../../../examples/androidextras \
diff --git a/src/androidextras/doc/src/external-resources.qdoc b/src/androidextras/doc/src/external-resources.qdoc
new file mode 100644
index 0000000..b27f97b
--- /dev/null
+++ b/src/androidextras/doc/src/external-resources.qdoc
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtAndroidExtras module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+ \externalpage https://developer.android.com/reference/android/app/Service#onStartCommand(android.content.Intent,%20int,%20int)
+ \title Android: Service onStartCommand
+*/
+
+/*!
+ \externalpage https://developer.android.com/reference/android/content/Context#startService(android.content.Intent)
+ \title Android: Service startService
+*/
+
+/*!
+ \externalpage https://developer.android.com/reference/android/content/BroadcastReceiver
+ \title Android: BroadcastReceiver
+*/