From ba78e8a1d678265e4c38e271d024b1978b1e7914 Mon Sep 17 00:00:00 2001
From: Topi Reinio <topi.reinio@digia.com>
Date: Thu, 2 Oct 2014 10:39:29 +0200
Subject: [PATCH] Doc: Fix issues in .qdocconf files
- Remove url variable (it's included from global doc config)
- Fix qhp selector for QML types
- Sort the examples in qhp
Change-Id: I7f72aebe4f5482ac922a294ad156f8a73e4ccc6e
Reviewed-by: Martin Smith <martin.smith@digia.com>
---
src/webengine/doc/qtwebengine.qdocconf | 4 ++--
src/webenginewidgets/doc/qtwebenginewidgets.qdocconf | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/webengine/doc/qtwebengine.qdocconf b/src/webengine/doc/qtwebengine.qdocconf
index 14094ac2f..e5abeafd6 100644
--- a/src/webengine/doc/qtwebengine.qdocconf
+++ b/src/webengine/doc/qtwebengine.qdocconf
@@ -2,7 +2,6 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
project = QtWebEngine
description = Qt WebEngine Reference Documentation
-url = http://qt-project.org/doc/qt-$QT_VER
version = $QT_VERSION
examplesinstallpath = webengine
@@ -21,11 +20,12 @@ qhp.QtWebEngine.customFilters.Qt.filterAttributes = qtwebengine $QT_VERSION
qhp.QtWebEngine.subprojects = qmltypes examples
qhp.QtWebEngine.subprojects.qmltypes.title = QML Types
qhp.QtWebEngine.subprojects.qmltypes.indexTitle = Qt WebEngine QML Types
-qhp.QtWebEngine.subprojects.qmltypes.selectors = fake:qmlclass
+qhp.QtWebEngine.subprojects.qmltypes.selectors = qmlclass
qhp.QtWebEngine.subprojects.qmltypes.sortPages = true
qhp.QtWebEngine.subprojects.examples.title = Examples
qhp.QtWebEngine.subprojects.examples.indexTitle = Qt WebEngine Examples
qhp.QtWebEngine.subprojects.examples.selectors = fake:example
+qhp.QtWebEngine.subprojects.examples.sortPages = true
tagfile = ../../../doc/qtwebengine/qtwebengine.tags
diff --git a/src/webenginewidgets/doc/qtwebenginewidgets.qdocconf b/src/webenginewidgets/doc/qtwebenginewidgets.qdocconf
index ea7239b2f..ad1e46f1c 100644
--- a/src/webenginewidgets/doc/qtwebenginewidgets.qdocconf
+++ b/src/webenginewidgets/doc/qtwebenginewidgets.qdocconf
@@ -2,7 +2,6 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
project = QtWebEngineWidgets
description = Qt WebEngineWidgets Reference Documentation
-url = http://qt-project.org/doc/qt-$QT_VER
version = $QT_VERSION
examplesinstallpath = webenginewidgets
@@ -26,6 +25,7 @@ qhp.QtWebEngineWidgets.subprojects.classes.sortPages = true
qhp.QtWebEngineWidgets.subprojects.examples.title = Examples
qhp.QtWebEngineWidgets.subprojects.examples.indexTitle = Qt WebEngine Widgets Examples
qhp.QtWebEngineWidgets.subprojects.examples.selectors = fake:example
+qhp.QtWebEngineWidgets.subprojects.examples.sortPages = true
tagfile = ../../../doc/qtwebenginewidgets/qtwebenginewidgets.tags
--
GitLab