summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@digia.com>2013-11-20 15:20:16 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-23 20:00:55 +0100
commitfb02f6e0e4625d2077c45a1bb7aea95c66a9cbb7 (patch)
tree2e9aa55f5e283aec860d412f98f23cac54bc9d73
parent8d3a15280a63d88341115933d4e8a3a2074d51c6 (diff)
Doc: Fix issues in Qt WebKit documentation config file
This change addresses following issues: - Replace hard-coded version strings with QT_VERSION et al. - Use the word 'Reference' in description for consistency - Add a url variable - Add a filter for Qt WebKit (usable in Qt Creator Help) - Use the correct selector for listing QML types Task-number: QTBUG-34966 Change-Id: Ic8f404720b02e022da964eadd50cbd140482809c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
-rw-r--r--Source/qtwebkit.qdocconf14
1 files changed, 10 insertions, 4 deletions
diff --git a/Source/qtwebkit.qdocconf b/Source/qtwebkit.qdocconf
index f10ef279e..d4da057e0 100644
--- a/Source/qtwebkit.qdocconf
+++ b/Source/qtwebkit.qdocconf
@@ -1,18 +1,24 @@
include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
project = QtWebKit
-description = "Qt WebKit API Documentation"
-version = 5.0.0
+description = Qt WebKit Reference Documentation
+url = http://qt-project.org/doc/qt-$QT_VER
+version = $QT_VERSION
# Defines the name of the project. You cannot use operators (+, =, -) in
# the name. Properties for this project are set using a qhp.<projectname>.property
# format.
qhp.projects = QtWebKit
qhp.QtWebKit.file = qtwebkit.qhp
-qhp.QtWebKit.namespace = org.qt-project.qtwebkit.500
+qhp.QtWebKit.namespace = org.qt-project.qtwebkit.$QT_VERSION_TAG
qhp.QtWebKit.indexTitle = Qt WebKit
qhp.QtWebKit.virtualFolder = qtwebkit
+# create a filter for Qt Creator/Assistant
+qhp.QtWebKit.filterAttributes = qtwebkit $QT_VERSION qtrefdoc
+qhp.QtWebKit.customFilters.Qt.name = QtWebKit $QT_VERSION
+qhp.QtWebKit.customFilters.Qt.filterAttributes = qtwebkit $QT_VERSION
+
# For listing child nodes in Qt Creator or Assistant.
qhp.QtWebKit.subprojects = classes qmltypes
qhp.QtWebKit.subprojects.classes.title = Qt WebKit Widgets
@@ -21,7 +27,7 @@ qhp.QtWebKit.subprojects.classes.selectors = class fake:headerfile
qhp.QtWebKit.subprojects.classes.sortPages = true
qhp.QtWebKit.subprojects.qmltypes.title = QML Types
qhp.QtWebKit.subprojects.qmltypes.indexTitle = Qt WebKit QML Types
-qhp.QtWebKit.subprojects.qmltypes.selectors = fake:headerfile
+qhp.QtWebKit.subprojects.qmltypes.selectors = fake:qmlclass
qhp.QtWebKit.subprojects.qmltypes.sortPages = true
headerdirs = WebKit/qt/Api WebKit/qt/WidgetApi WebKit2/UIProcess/API/qt