From 5c389cecd07a4659670e3fefa34d717762dc3af1 Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Tue, 5 Nov 2013 13:03:33 +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: Ifa55fcd9e402b0e184a41e316340e46aeb7101de Reviewed-by: Topi Reiniö Reviewed-by: Leena Miettinen --- qmake/doc/qmake.qdocconf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'qmake') diff --git a/qmake/doc/qmake.qdocconf b/qmake/doc/qmake.qdocconf index 537c6b3e65..a5bd089a5d 100644 --- a/qmake/doc/qmake.qdocconf +++ b/qmake/doc/qmake.qdocconf @@ -2,7 +2,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QMake description = QMake Manual -url = http://qt-project.org/doc/qt-$QT_VER/qmake +url = http://qt-project.org/doc/qt-$QT_VER qhp.projects = qmake @@ -75,4 +75,3 @@ depends += \ qtx11extras \ qtxml \ qtxmlpatterns - -- cgit v1.2.3