summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-12-03 18:28:16 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-12-03 18:28:17 +0100
commit5c814406c67910158bbf725d9a7fcb10fe9f96ee (patch)
tree292c2a349bccc01e2e6c01a1648d4e2fef65ff58
parent00dd0582d1f31ae1d3e820d04790e31ad64f272a (diff)
parent634cddbfef6a40b991bcdf8e68e5329747f43c57 (diff)
Merge remote-tracking branch 'origin/release' into stablev5.2.1
-rw-r--r--doc/qtwebkitexamples.qdocconf4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/qtwebkitexamples.qdocconf b/doc/qtwebkitexamples.qdocconf
index b704503..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
@@ -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