diff options
author | Topi Reinio <topi.reinio@digia.com> | 2013-06-13 15:13:32 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-16 12:41:51 +0200 |
commit | 27d22c5f4201c7555b42e187252bee3fd88d3821 (patch) | |
tree | 8977189090a5977884558634b99233fff62d175a /examples/declarative/demos/doc/src/qml-calculator.qdoc | |
parent | 82ffec0b3daab59c96b5f1d5963566bd9418766e (diff) |
Doc: Move Qt Quick 1 demos and their documentationold/5.1
When installing the examples, we currently end up with a
QT_INSTALL_EXAMPLES/demos directory with nothing but documentation
files.
This change moves the docs and also the demos themselves into
examples/declarative/demos.
Also fixes the links in demo .qdoc files.
Task-number: QTBUG-31722
Change-Id: Ied15526be1db8437e14be786ea69eae98af8dd3f
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'examples/declarative/demos/doc/src/qml-calculator.qdoc')
-rw-r--r-- | examples/declarative/demos/doc/src/qml-calculator.qdoc | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/examples/declarative/demos/doc/src/qml-calculator.qdoc b/examples/declarative/demos/doc/src/qml-calculator.qdoc new file mode 100644 index 00000000..fb470771 --- /dev/null +++ b/examples/declarative/demos/doc/src/qml-calculator.qdoc @@ -0,0 +1,37 @@ +/**************************************************************************** +** +** 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$ +** +****************************************************************************/ + +/*! + \title Calculator + \example declarative/demos/calculator + \brief Shows how to write a calculator in QML + \ingroup qmldemos + + This example shows how to write a simple calculator application in QML and JavaScript. + + \image qml-calculator-example.png +*/ |