summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@digia.com>2013-11-05 13:32:12 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-06 10:56:32 +0100
commit78985c5c2c4ec8c7d06bf0c59c5534f968d62f07 (patch)
tree89f52cc3009595b26e19c8f2c300368f57f28c00
parenta2193d3adb703cc14efc21963f0fb0dc4c964e9f (diff)
downloadqtscript-78985c5c2c4ec8c7d06bf0c59c5534f968d62f07.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: I77ed98ade58cdd4c6f5c365682993f1be3f3e958 Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
-rw-r--r--src/script/doc/qtscript.qdocconf1
-rw-r--r--src/scripttools/doc/qtscripttools.qdocconf1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/script/doc/qtscript.qdocconf b/src/script/doc/qtscript.qdocconf
index a58e1e7..b534300 100644
--- a/src/script/doc/qtscript.qdocconf
+++ b/src/script/doc/qtscript.qdocconf
@@ -2,6 +2,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
# Name of the project which must match the outputdir. Determines the .index file
project = QtScript
+url = http://qt-project.org/doc/qt-$QT_VER
# Directories in which to search for files to document and images.
# By default set to the root directory of the project for sources
diff --git a/src/scripttools/doc/qtscripttools.qdocconf b/src/scripttools/doc/qtscripttools.qdocconf
index 95ebf8a..0cc071a 100644
--- a/src/scripttools/doc/qtscripttools.qdocconf
+++ b/src/scripttools/doc/qtscripttools.qdocconf
@@ -2,6 +2,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
# Name of the project which must match the outputdir. Determines the .index file
project = QtScriptTools
+url = http://qt-project.org/doc/qt-$QT_VER
# Directories in which to search for files to document and images.
# By default set to the root directory of the project for sources