diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-09 00:46:38 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-09 00:48:36 +0200 |
| commit | 686b98e556361f70be11a308171227d0770825a6 (patch) | |
| tree | 03849e6fef42185d07c6cc0b8b1737f644faf92b | |
| parent | eae2f503c015cdf5f6a97a9b10988a2e9ac09d87 (diff) | |
| parent | 960276ccce0f74d239525cb465fc6e21dcafccec (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: I1ddc8586418c2d6915481c27d95dfa331c32738a
| -rw-r--r-- | examples/androidextras/notification/doc/src/qtandroidextras-example-notification.qdoc | 6 |
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} */ |