diff options
author | Topi Reinio <topi.reinio@digia.com> | 2015-06-12 15:43:39 +0200 |
---|---|---|
committer | Topi Reiniƶ <topi.reinio@digia.com> | 2015-06-15 11:28:58 +0000 |
commit | 60cb61f9d70ec52f3193bac44384099d921827b3 (patch) | |
tree | d24608c2e7c438f603c8e566e1b5a45f29d6afcd /src/render/doc/src/qt3d-examples.qdoc | |
parent | 6f93508bcd38d8d0fa524ac00d65b518fac0d82a (diff) |
Doc: Fix multiple documentation issuesv5.5.0-rc1
- Restore qt3d-index.html as the main landing page. Needed
for external linking.
- Fix \inmodule commands for Renderer classes
- Add proper group so that all three modules are listed on
the landing page, both C++ and QML modules
- Remove qt3drenderer-index.html (to be consistent with
Qt3DCore), copy contents over to the module page and
to a new file, qt3d-examples.qdoc.
- Fix indexTitles in qdocconf files, and subprojects for
Renderer QML types and Qt3D examples
Change-Id: I0e2497771d0525d120ffa9d7d6338b01fdfa6963
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Diffstat (limited to 'src/render/doc/src/qt3d-examples.qdoc')
-rw-r--r-- | src/render/doc/src/qt3d-examples.qdoc | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/src/render/doc/src/qt3d-examples.qdoc b/src/render/doc/src/qt3d-examples.qdoc new file mode 100644 index 000000000..4ba413e50 --- /dev/null +++ b/src/render/doc/src/qt3d-examples.qdoc @@ -0,0 +1,41 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** 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 The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/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$ +** +****************************************************************************/ + +/*! + \page qt3d-examples.html + \ingroup all-examples + \title Qt3D Examples + \brief Examples that demonstrate 2D and 3D rendering using Qt3D. + + The following examples demonstrate 2D and 3D rendering using Qt3D. + + \section1 QML Examples + \annotatedlist qt3d-examples-qml + + \section1 C++ Examples + \annotatedlist qt3d-examples-cpp +*/ |