diff options
author | Jerome Pasion <jerome.pasion@digia.com> | 2012-08-08 12:18:55 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-21 10:25:11 +0200 |
commit | 5c88efc06d152ac675b4369d854699b137631fa0 (patch) | |
tree | 85e833ecd1914c71ae92280aaf44c48a878d0453 /examples/qml | |
parent | f66624bf294663a3dd0777692e8ad8dbb19f3819 (diff) |
Examples: Moved example documentation.
-inline \example pages into separate .qdoc files
-fixed broken links to paths
-moved ui-components under examples/quick
Change-Id: I6e009b9213be3e1f4bed51bdbeb76a7a2142c80b
Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'examples/qml')
-rw-r--r-- | examples/qml/dynamicscene/doc/src/dynamicscene.qdoc | 34 | ||||
-rw-r--r-- | examples/qml/dynamicscene/dynamicscene.qml | 7 | ||||
-rw-r--r-- | examples/qml/i18n/doc/src/i18n.qdoc | 48 | ||||
-rw-r--r-- | examples/qml/i18n/i18n.qml | 24 | ||||
-rw-r--r-- | examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc | 38 | ||||
-rw-r--r-- | examples/qml/xmlhttprequest/xmlhttprequest.qml | 14 |
6 files changed, 121 insertions, 44 deletions
diff --git a/examples/qml/dynamicscene/doc/src/dynamicscene.qdoc b/examples/qml/dynamicscene/doc/src/dynamicscene.qdoc new file mode 100644 index 0000000000..53a19e0561 --- /dev/null +++ b/examples/qml/dynamicscene/doc/src/dynamicscene.qdoc @@ -0,0 +1,34 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** GNU Free Documentation License +** 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. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms +** and conditions contained in a signed written agreement between you +** and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +/*! + \title QML Example - Dynamic Scene + \example qml/dynamicscene + \brief This example demonstrates creating components dynamically. + \image qml-dynamicscene-example.png +*/ + + diff --git a/examples/qml/dynamicscene/dynamicscene.qml b/examples/qml/dynamicscene/dynamicscene.qml index 4771742621..66521b8caa 100644 --- a/examples/qml/dynamicscene/dynamicscene.qml +++ b/examples/qml/dynamicscene/dynamicscene.qml @@ -38,13 +38,6 @@ ** ****************************************************************************/ -/*! - \title QML Example - Dynamic Scene - \example qml/dynamicscene - \brief This example demonstrates creating components dynamically. - \image qml-dynamicscene-example.png -*/ - import QtQuick 2.0 import QtQuick.Particles 2.0 import "content" diff --git a/examples/qml/i18n/doc/src/i18n.qdoc b/examples/qml/i18n/doc/src/i18n.qdoc new file mode 100644 index 0000000000..d9f3eaaf58 --- /dev/null +++ b/examples/qml/i18n/doc/src/i18n.qdoc @@ -0,0 +1,48 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** GNU Free Documentation License +** 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. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms +** and conditions contained in a signed written agreement between you +** and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +/*! + \title QML Examples - Internationalization + \example qml/i18n + \image qml-i18n-example.png + \brief This is an internationalization example + + The QML runtime automatically loads a translation from the i18n subdirectory of the root + QML file, based on the system language. + + The files are created/updated by running: + + lupdate i18n.qml -ts i18n/base.ts + + Translations for new languages are created by copying i18n/base.ts to i18n/qml_<lang>.ts + The .ts files can then be edited with Linguist: + + linguist i18n/qml_fr.ts + + The run-time translation files are then generated by running: + + lrelease i18n/*.ts +*/ diff --git a/examples/qml/i18n/i18n.qml b/examples/qml/i18n/i18n.qml index 2ffdd1914f..b924fb07c9 100644 --- a/examples/qml/i18n/i18n.qml +++ b/examples/qml/i18n/i18n.qml @@ -40,30 +40,6 @@ import QtQuick 2.0 -/*! - \title QML Examples - Internationalization - \example qml/i18n - \image qml-i18n-example.png - \brief This is an internationalization example - - The QML runtime automatically loads a translation from the i18n subdirectory of the root - QML file, based on the system language. - - The files are created/updated by running: - - lupdate i18n.qml -ts i18n/base.ts - - Translations for new languages are created by copying i18n/base.ts to i18n/qml_<lang>.ts - The .ts files can then be edited with Linguist: - - linguist i18n/qml_fr.ts - - The run-time translation files are then generated by running: - - lrelease i18n/*.ts -*/ - - Rectangle { width: 640; height: 480 diff --git a/examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc b/examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc new file mode 100644 index 0000000000..ae76c28d16 --- /dev/null +++ b/examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc @@ -0,0 +1,38 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** GNU Free Documentation License +** 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. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms +** and conditions contained in a signed written agreement between you +** and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +/*! + \title QtQuick Examples - XMLHttpRequst + \example qml/xmlhttprequest + \brief This is a collection of XMLHttpRequest examples + \image qml-xmlhttprequest-example.png + + This is a collection of small QML examples relating to XML HTTP request functionality. + + Get data demos sending get XML request and showing the received header and XML body. + +*/ + diff --git a/examples/qml/xmlhttprequest/xmlhttprequest.qml b/examples/qml/xmlhttprequest/xmlhttprequest.qml index efe7d428db..5f950adc52 100644 --- a/examples/qml/xmlhttprequest/xmlhttprequest.qml +++ b/examples/qml/xmlhttprequest/xmlhttprequest.qml @@ -41,18 +41,6 @@ import QtQuick 2.0 import "../../shared" as Examples -/*! - \title QtQuick Examples - XMLHttpRequst - \example qtquick/xmlhttprequest - \brief This is a collection of XMLHttpRequest examples - \image qml-xmlhttprequest-example.png - - This is a collection of small QML examples relating to XML HTTP request functionality. - - Get data demos sending get XML request and showing the received header and XML body. - -*/ - Item { height: 480 width: 320 @@ -63,4 +51,4 @@ Item { addExample("Get data", "Send get request and show received header and body", Qt.resolvedUrl("get.qml")); } } -}
\ No newline at end of file +} |