From 0a67390da5afed7c3308ae940624a983fbdd99b8 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Wed, 20 Nov 2013 15:48:34 +0100 Subject: Doc: Fix module name used in documentation filter Qt WebKit Examples creates a filter with name 'QtWebKit'. Change it to use the correct name so that Qt WebKit can add its own filter. Task-number: QTBUG-34966 Change-Id: Iad74a20d72eebf2e20309a54f633a24f8c1e3d12 Reviewed-by: Jerome Pasion Reviewed-by: Lars Knoll --- doc/qtwebkitexamples.qdocconf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/qtwebkitexamples.qdocconf b/doc/qtwebkitexamples.qdocconf index b704503..8a760a3 100644 --- a/doc/qtwebkitexamples.qdocconf +++ b/doc/qtwebkitexamples.qdocconf @@ -17,7 +17,7 @@ qhp.QtWebKitExamples.indexTitle = Qt WebKit Examples qhp.QtWebKitExamples.virtualFolder = qtwebkitexamples qhp.QtWebKitExamples.indexRoot = qhp.QtWebKitExamples.filterAttributes = qtwebkitexamples $QT_VERSION qtrefdoc -qhp.QtWebKitExamples.customFilters.Qt.name = QtWebKit $QT_VERSION +qhp.QtWebKitExamples.customFilters.Qt.name = QtWebKitExamples $QT_VERSION qhp.QtWebKitExamples.customFilters.Qt.filterAttributes = qtwebkitexamples $QT_VERSION qhp.QtWebKitExamples.subprojects = manual -- cgit v1.2.3 From 634cddbfef6a40b991bcdf8e68e5329747f43c57 Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Tue, 5 Nov 2013 13:38:48 +0100 Subject: Doc: Updated url variable in qdocconf files. 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: If867f487719da5cccf1b0edd91f620728885b1fd Reviewed-by: Leena Miettinen Reviewed-by: Lars Knoll --- doc/qtwebkitexamples.qdocconf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/qtwebkitexamples.qdocconf b/doc/qtwebkitexamples.qdocconf index 8a760a3..b468664 100644 --- a/doc/qtwebkitexamples.qdocconf +++ b/doc/qtwebkitexamples.qdocconf @@ -2,7 +2,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtWebKitExamples description = "Qt WebKit Examples Documentation" -url = http://qt-project.org/doc/qt-$QT_VER/qtwebkitexamples +url = http://qt-project.org/doc/qt-$QT_VER version = $QT_VERSION # Defines the name of the project. You cannot use operators (+, =, -) in -- cgit v1.2.3