summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@digia.com>2013-11-05 13:18:46 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-06 10:55:50 +0100
commit73bb77dc21ef3d9d80563184e35fd2eb00c7b55b (patch)
tree8178e75938bdb56c01115deba7585e4bc7edef9e
parent06860b6ed9c2dc7d00ef5d5afe913aea2bdf0be1 (diff)
downloadqtlocation-73bb77dc21ef3d9d80563184e35fd2eb00c7b55b.tar.gz
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: Ibc0d4b9ef43bfb0e584d95fac8e97ec472e1e0e8 Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
-rw-r--r--src/location/doc/qtlocation.qdocconf2
-rw-r--r--src/positioning/doc/qtpositioning.qdocconf2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/location/doc/qtlocation.qdocconf b/src/location/doc/qtlocation.qdocconf
index 8e000634..6abc0ad0 100644
--- a/src/location/doc/qtlocation.qdocconf
+++ b/src/location/doc/qtlocation.qdocconf
@@ -2,7 +2,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
project = QtLocation
description = Qt Location Reference Documentation
-url = http://qt-project.org/doc/qt-$QT_VER/qtlocation
+url = http://qt-project.org/doc/qt-$QT_VER
version = $QT_VERSION
diff --git a/src/positioning/doc/qtpositioning.qdocconf b/src/positioning/doc/qtpositioning.qdocconf
index 182cb7a8..14679477 100644
--- a/src/positioning/doc/qtpositioning.qdocconf
+++ b/src/positioning/doc/qtpositioning.qdocconf
@@ -2,7 +2,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
project = QtPositioning
description = Qt Positioning Reference Documentation
-url = http://qt-project.org/doc/qt-$QT_VER/qtpositioning
+url = http://qt-project.org/doc/qt-$QT_VER
version = $QT_VERSION