diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-17 18:25:39 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-17 18:25:39 +0100 |
commit | 6863ce4e3582745ad683df646746fe23a8e21592 (patch) | |
tree | 8bae39f23dddd59a80d9942a45d60ccf414f7810 /examples/assistant/doc/src/remotecontrol.qdoc | |
parent | b18f31c9aebd273fd58646dc484d44b91662fa7a (diff) | |
parent | 9b0b4e799aadde36521acff0dc3439b4eae51877 (diff) | |
download | qttools-6863ce4e3582745ad683df646746fe23a8e21592.tar.gz |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
sync.profile
Change-Id: I9871b004cc76d14d34f4a904cd7a8e4f8e2bb91a
Diffstat (limited to 'examples/assistant/doc/src/remotecontrol.qdoc')
-rw-r--r-- | examples/assistant/doc/src/remotecontrol.qdoc | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/examples/assistant/doc/src/remotecontrol.qdoc b/examples/assistant/doc/src/remotecontrol.qdoc new file mode 100644 index 000000000..8e1aa4d2a --- /dev/null +++ b/examples/assistant/doc/src/remotecontrol.qdoc @@ -0,0 +1,34 @@ +/**************************************************************************** +** +** Copyright (C) 2013 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. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \example remotecontrol + \ingroup examples-qtassistant + \title Remote Control Example + + \brief Using and controlling Qt Assistant as a help viewer. +*/ |