Commit b315d3e5 authored by Topi Reinio's avatar Topi Reinio Committed by The Qt Project
Browse files

Doc: Fix module names in .qdocconf for Qt Multimedia & Widgets


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: default avatarJerome Pasion <jerome.pasion@digia.com>
parent 63f0fcb5
Branches
Tags
No related merge requests found
Showing with 26 additions and 30 deletions
include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
project = qtmultimedia project = QtMultimedia
description = Qt Multimedia Documentation description = Qt Multimedia Documentation
url = http://qt-project.org/doc/qt-$QT_VER/qtmultimedia url = http://qt-project.org/doc/qt-$QT_VER/qtmultimedia
version = $QT_VERSION version = $QT_VERSION
...@@ -12,22 +12,22 @@ version = $QT_VERSION ...@@ -12,22 +12,22 @@ version = $QT_VERSION
# Defines the name of the project. You cannot use operators (+, =, -) in # Defines the name of the project. You cannot use operators (+, =, -) in
# the name. Properties for this project are set using a qhp.<projectname>.property # the name. Properties for this project are set using a qhp.<projectname>.property
# format. # format.
qhp.projects = qtmultimedia qhp.projects = QtMultimedia
qhp.qtmultimedia.file = qtmultimedia.qhp qhp.QtMultimedia.file = qtmultimedia.qhp
qhp.qtmultimedia.namespace = org.qt-project.qtmultimedia.$QT_VERSION_TAG qhp.QtMultimedia.namespace = org.qt-project.qtmultimedia.$QT_VERSION_TAG
qhp.qtmultimedia.indexTitle = Qt Multimedia qhp.QtMultimedia.indexTitle = Qt Multimedia
qhp.qtmultimedia.virtualFolder = qtmultimedia qhp.QtMultimedia.virtualFolder = qtmultimedia
# For listing child nodes in Qt Creator or Assistant. # For listing child nodes in Qt Creator or Assistant.
qhp.qtmultimedia.subprojects = classes qmltypes qhp.QtMultimedia.subprojects = classes qmltypes
qhp.qtmultimedia.subprojects.classes.title = C++ Classes qhp.QtMultimedia.subprojects.classes.title = C++ Classes
qhp.qtmultimedia.subprojects.classes.indexTitle = Qt Multimedia C++ Classes qhp.QtMultimedia.subprojects.classes.indexTitle = Qt Multimedia C++ Classes
qhp.qtmultimedia.subprojects.classes.selectors = class fake:headerfile qhp.QtMultimedia.subprojects.classes.selectors = class fake:headerfile
qhp.qtmultimedia.subprojects.classes.sortPages = true qhp.QtMultimedia.subprojects.classes.sortPages = true
qhp.qtmultimedia.subprojects.qmltypes.title = QML Types qhp.QtMultimedia.subprojects.qmltypes.title = QML Types
qhp.qtmultimedia.subprojects.qmltypes.indexTitle = Qt Multimedia QML Types qhp.QtMultimedia.subprojects.qmltypes.indexTitle = Qt Multimedia QML Types
qhp.qtmultimedia.subprojects.qmltypes.selectors = fake:qmlclass qhp.QtMultimedia.subprojects.qmltypes.selectors = fake:qmlclass
qhp.qtmultimedia.subprojects.qmltypes.sortPages = true qhp.QtMultimedia.subprojects.qmltypes.sortPages = true
exampledirs += ../../../examples/multimedia \ exampledirs += ../../../examples/multimedia \
snippets snippets
......
include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
project = qtmultimediawidgets project = QtMultimediaWidgets
description = Qt Multimedia Widgets Documentation description = Qt Multimedia Widgets Documentation
url = http://qt-project.org/doc/qt-$QT_VER/qtmultimediawidgets url = http://qt-project.org/doc/qt-$QT_VER/qtmultimediawidgets
version = $QT_VERSION version = $QT_VERSION
...@@ -12,22 +12,18 @@ version = $QT_VERSION ...@@ -12,22 +12,18 @@ version = $QT_VERSION
# Defines the name of the project. You cannot use operators (+, =, -) in # Defines the name of the project. You cannot use operators (+, =, -) in
# the name. Properties for this project are set using a qhp.<projectname>.property # the name. Properties for this project are set using a qhp.<projectname>.property
# format. # format.
qhp.projects = qtmultimediawidgets qhp.projects = QtMultimediaWidgets
qhp.qtmultimediawidgets.file = qtmultimediawidgets.qhp qhp.QtMultimediaWidgets.file = qtmultimediawidgets.qhp
qhp.qtmultimediawidgets.namespace = org.qt-project.qtmultimediawidgets.$QT_VERSION_TAG qhp.QtMultimediaWidgets.namespace = org.qt-project.qtmultimediawidgets.$QT_VERSION_TAG
qhp.qtmultimediawidgets.indexTitle = Qt Multimedia qhp.QtMultimediaWidgets.indexTitle = Qt Multimedia Widgets
qhp.qtmultimediawidgets.virtualFolder = qtmultimediawidgets qhp.QtMultimediaWidgets.virtualFolder = qtmultimediawidgets
# For listing child nodes in Qt Creator or Assistant. # For listing child nodes in Qt Creator or Assistant.
qhp.qtmultimediawidgets.subprojects = classes qmltypes qhp.QtMultimediaWidgets.subprojects = classes
qhp.qtmultimediawidgets.subprojects.classes.title = C++ Classes qhp.QtMultimediaWidgets.subprojects.classes.title = C++ Classes
qhp.qtmultimediawidgets.subprojects.classes.indexTitle = Qt Multimedia Widgets C++ Classes qhp.QtMultimediaWidgets.subprojects.classes.indexTitle = Qt Multimedia Widgets C++ Classes
qhp.qtmultimediawidgets.subprojects.classes.selectors = class fake:headerfile qhp.QtMultimediaWidgets.subprojects.classes.selectors = class fake:headerfile
qhp.qtmultimediawidgets.subprojects.classes.sortPages = true qhp.QtMultimediaWidgets.subprojects.classes.sortPages = true
qhp.qtmultimediawidgets.subprojects.qmltypes.title = QML Types
qhp.qtmultimediawidgets.subprojects.qmltypes.indexTitle = Qt Multimedia Widgets QML Types
qhp.qtmultimediawidgets.subprojects.qmltypes.selectors = fake:qmlclass
qhp.qtmultimediawidgets.subprojects.qmltypes.sortPages = true
exampledirs += ../../../examples/multimediawidgets \ exampledirs += ../../../examples/multimediawidgets \
snippets snippets
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment