From 9203b61ee7024397b1004d5c82585e5f4e4ab130 Mon Sep 17 00:00:00 2001 From: Jerome Pasion <jerome.pasion@digia.com> Date: Tue, 5 Nov 2013 13:28:35 +0100 Subject: [PATCH] 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: Ifb9ba5c4a0e78b6170c448ec97f0bec8fa80bdfe Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> --- src/controls/doc/qtquickcontrols.qdocconf | 2 +- src/layouts/doc/qtquicklayouts.qdocconf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/controls/doc/qtquickcontrols.qdocconf b/src/controls/doc/qtquickcontrols.qdocconf index 440cbff3a..4c97d5c85 100644 --- a/src/controls/doc/qtquickcontrols.qdocconf +++ b/src/controls/doc/qtquickcontrols.qdocconf @@ -2,7 +2,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtQuickControls description = Qt Quick Controls Reference Documentation -url = http://qt-project.org/doc/qt-$QT_VER/qtquickcontrols/ +url = http://qt-project.org/doc/qt-$QT_VER version = $QT_VERSION qhp.projects = QtQuickControls diff --git a/src/layouts/doc/qtquicklayouts.qdocconf b/src/layouts/doc/qtquicklayouts.qdocconf index 1356fd405..41fcc6a11 100644 --- a/src/layouts/doc/qtquicklayouts.qdocconf +++ b/src/layouts/doc/qtquicklayouts.qdocconf @@ -2,7 +2,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtQuickLayouts description = Qt Quick Layouts Reference Documentation -url = http://qt-project.org/doc/qt-$QT_VER/qtquicklayouts/ +url = http://qt-project.org/doc/qt-$QT_VER version = $QT_VERSION qhp.projects = QtQuickLayouts -- GitLab