summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-01-30 18:07:27 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-02-06 09:45:25 +0100
commit34892613599915b89355e917218da9b3d0b9ef52 (patch)
tree2c3ba46c03dc368e7e9ac6813e629acc7cff72b9
parent8a966f217a3adca9bef9113437e0e17c7a478cd2 (diff)
downloadqtdoc-34892613599915b89355e917218da9b3d0b9ef52.tar.gz
fix doc page urls
they are versioned nowadays. also, the qmake manual lives under qtdoc, not qtcore. Change-Id: I3763448b2cd44a0ad1cfc473e474bf7714a4f8d0 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
-rw-r--r--doc/config/qmake.qdocconf2
-rw-r--r--doc/config/qtdoc-project.qdocconf2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/config/qmake.qdocconf b/doc/config/qmake.qdocconf
index 80ccdab9..68418568 100644
--- a/doc/config/qmake.qdocconf
+++ b/doc/config/qmake.qdocconf
@@ -6,7 +6,7 @@ include(qt-defines.qdocconf)
project = QMake
description = QMake Manual
-url = http://qt-project.org/doc/qtcore
+url = http://qt-project.org/doc/qt-$QT_VER/qtdoc
indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index
diff --git a/doc/config/qtdoc-project.qdocconf b/doc/config/qtdoc-project.qdocconf
index e7640159..50c7f14d 100644
--- a/doc/config/qtdoc-project.qdocconf
+++ b/doc/config/qtdoc-project.qdocconf
@@ -1,6 +1,6 @@
project = QtDoc
description = Qt Reference Documentation
-url = http://qt-project.org/doc/qtdoc
+url = http://qt-project.org/doc/qt-$QT_VER/qtdoc
version = $QT_VERSION
depends += \