summaryrefslogtreecommitdiffstats
path: root/src/multimediawidgets/doc
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Updated url variable in qdocconf files.Jerome Pasion2013-11-061-1/+1
| | | | | | | | | | | | | | In 5.2, the HTML output is in a flatter structure and when they are hosted in qt-project.org/doc, the documentation will be found at http://qt-project.org/doc/qt-$QT_VER The url variable is used by projects outside of Qt 5 which need to link to Qt 5 documentation, such as Qt Creator. Task-number: QTBUG-34584 Change-Id: I3971987490ef7c2f8060383ffc2e141558f827c9 Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Merge branch 'stable' into devSergio Ahumada2013-08-051-1/+0
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id3427cb1a80956ba61373313c21b4b9aa007ea54
| * Moved declarative-camera example in the right directory.Yoann Lopes2013-07-241-1/+0
| | | | | | | | | | | | | | | | | | This example was in the multimediawidgets directory but doesn't depend on or use the QtMultimediaWidgets module. Moved to 'examples/multimedia' instead. Change-Id: Ic2fcc6576e95664e0002531ee378a4366daa56c1 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Doc: Setting \qtvariable values in module pages.Jerome Pasion2013-08-021-0/+1
| | | | | | | | | | | | | | \qtvariable is the QT variable in .pro files. Change-Id: Ib2e78579bbc67346b6c3431d03e01a4858439ac4 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Doc: Setting navigation variables for Multimedia and Multimedia WidgetsJerome Pasion2013-06-261-0/+3
|/ | | | | | | | -for navigation bar Change-Id: I2d60e0145952c99afb6b103d0188ce846c192634 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Define example install paths in .qdocconfTopi Reinio2013-05-031-0/+3
| | | | | | | | | QDoc needs to know the directory under which the examples are installed in QT_INSTALL_EXAMPLES. Without them, example manifest files may contain invalid paths. Change-Id: I3d27517e41e3b1deb7643ca1a40f3905c0e5cc1a Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Fix module names in .qdocconf for Qt Multimedia & WidgetsTopi Reinio2013-04-191-15/+11
| | | | | | | | | | | | | This change fixes QCH documentation title for Qt Multimedia Widgets. Also, the project names are changed to use CamelCase - this is required as qdoc will generate visible output (tags in example manifest files) based on those names. Also, removes documentation topic for QML types from Qt Multimedia Widgets as it doesn't have any. Change-Id: Ic5f3b7a3094a1012f3c356f0195a8eb40d9d9e35 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Adding Qt Multimedia Widgets documentation.Jerome Pasion2013-02-263-0/+157
-added landing page and module page -linked to Qt Multimedia and Qt Widgets -excluded multimediawidgets dir from the Qt Multimedia documentation Task-number: QTBUG-29339 Change-Id: Iaa8dc4117505d5635b8cab97ed5c10e9c4a289e6 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>