From fb199a5045f6637a9ecbbf53bd32170a185b3854 Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Tue, 5 Nov 2013 13:27:13 +0100 Subject: Doc: Updated url variable in qdocconf files. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: I3971987490ef7c2f8060383ffc2e141558f827c9 Reviewed-by: Topi Reiniö Reviewed-by: Leena Miettinen --- src/multimedia/doc/qtmultimedia.qdocconf | 2 +- src/multimediawidgets/doc/qtmultimediawidgets.qdocconf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/multimedia/doc/qtmultimedia.qdocconf b/src/multimedia/doc/qtmultimedia.qdocconf index 5f82a330b..83abf5b49 100644 --- a/src/multimedia/doc/qtmultimedia.qdocconf +++ b/src/multimedia/doc/qtmultimedia.qdocconf @@ -2,7 +2,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtMultimedia description = Qt Multimedia Documentation -url = http://qt-project.org/doc/qt-$QT_VER/qtmultimedia +url = http://qt-project.org/doc/qt-$QT_VER version = $QT_VERSION # The following parameters are for creating a qhp file, the qhelpgenerator diff --git a/src/multimediawidgets/doc/qtmultimediawidgets.qdocconf b/src/multimediawidgets/doc/qtmultimediawidgets.qdocconf index 5648041ad..92d4dc099 100644 --- a/src/multimediawidgets/doc/qtmultimediawidgets.qdocconf +++ b/src/multimediawidgets/doc/qtmultimediawidgets.qdocconf @@ -2,7 +2,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtMultimediaWidgets description = Qt Multimedia Widgets Documentation -url = http://qt-project.org/doc/qt-$QT_VER/qtmultimediawidgets +url = http://qt-project.org/doc/qt-$QT_VER version = $QT_VERSION # The following parameters are for creating a qhp file, the qhelpgenerator -- cgit v1.2.3