aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-05-01 12:42:53 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-05-01 12:43:40 +0200
commit960276ccce0f74d239525cb465fc6e21dcafccec (patch)
tree5f3a2e9d3a84f47dd9b8a708508b8eacd0e41e07
parentc77f7f99ff3948b8d2104634217dd9a4df7d07d8 (diff)
parent585d3147c9b6f800db5906b4418b3159151a1f35 (diff)
Merge remote-tracking branch 'origin/release' into stablev5.3.1
-rw-r--r--examples/androidextras/notification/doc/src/qtandroidextras-example-notification.qdoc6
1 files changed, 5 insertions, 1 deletions
diff --git a/examples/androidextras/notification/doc/src/qtandroidextras-example-notification.qdoc b/examples/androidextras/notification/doc/src/qtandroidextras-example-notification.qdoc
index 1eb6c6f..d499e62 100644
--- a/examples/androidextras/notification/doc/src/qtandroidextras-example-notification.qdoc
+++ b/examples/androidextras/notification/doc/src/qtandroidextras-example-notification.qdoc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the documentation of the Qt Toolkit.
@@ -38,4 +38,8 @@
Click on either of the smiley faces to put a notification in the status area of the Android
device.
+
+ \include examples-run.qdocinc
+
+ \sa {Qt for Android}, {Qt Android Extras}
*/