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: Ic0eed7f0d5fbc04544858b8dda3637ea788daac8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>

diff --git a/src/assistant/assistant/doc/qtassistant.qdocconf b/src/assistant/assistant/doc/qtassistant.qdocconf
index 76cb67e..c9c3801 100644 (file)
--- a/src/assistant/assistant/doc/qtassistant.qdocconf
+++ b/src/assistant/assistant/doc/qtassistant.qdocconf
@@ -2,7 +2,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
 project                 = QtAssistant
 description             = Qt Assistant Manual
-url                     = http://qt-project.org/doc/qt-$QT_VER/qtassistant
+url                     = http://qt-project.org/doc/qt-$QT_VER
 
 qhp.projects            = QtAssistant
 

diff --git a/src/assistant/help/doc/qthelp.qdocconf b/src/assistant/help/doc/qthelp.qdocconf
index d62e242..a5581a0 100644 (file)
--- a/src/assistant/help/doc/qthelp.qdocconf
+++ b/src/assistant/help/doc/qthelp.qdocconf
@@ -2,7 +2,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
 project                 = QtHelp
 description             = Qt Help Reference Documentation
-url                     = http://qt-project.org/doc/qt-$QT_VER/qthelp
+url                     = http://qt-project.org/doc/qt-$QT_VER
 version                 = $QT_VERSION
 
 examplesinstallpath     = help

diff --git a/src/designer/src/designer/doc/qtdesigner.qdocconf b/src/designer/src/designer/doc/qtdesigner.qdocconf
index 4d9b55d..803e108 100644 (file)
--- a/src/designer/src/designer/doc/qtdesigner.qdocconf
+++ b/src/designer/src/designer/doc/qtdesigner.qdocconf
@@ -2,7 +2,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
 project                 = QtDesigner
 description             = Qt Designer Manual
-url                     = http://qt-project.org/doc/qt-$QT_VER/qtdesigner
+url                     = http://qt-project.org/doc/qt-$QT_VER
 
 qhp.projects            = QtDesigner
 

diff --git a/src/designer/src/uitools/doc/qtuitools.qdocconf b/src/designer/src/uitools/doc/qtuitools.qdocconf
index ebcd40b..89aa41f 100644 (file)
--- a/src/designer/src/uitools/doc/qtuitools.qdocconf
+++ b/src/designer/src/uitools/doc/qtuitools.qdocconf
@@ -2,7 +2,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
 project                 = QtUiTools
 description             = Qt UI Tools Reference Documentation
-url                     = http://qt-project.org/doc/qt-$QT_VER/qtuitools
+url                     = http://qt-project.org/doc/qt-$QT_VER
 version                 = $QT_VERSION
 
 examplesinstallpath     = uitools

diff --git a/src/linguist/linguist/doc/qtlinguist.qdocconf b/src/linguist/linguist/doc/qtlinguist.qdocconf
index 9bb37c1..51e472a 100644 (file)
--- a/src/linguist/linguist/doc/qtlinguist.qdocconf
+++ b/src/linguist/linguist/doc/qtlinguist.qdocconf
@@ -2,7 +2,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
 project                 = QtLinguist
 description             = Qt Linguist Manual
-url                     = http://qt-project.org/doc/qt-$QT_VER/qtlinguist
+url                     = http://qt-project.org/doc/qt-$QT_VER
 
 qhp.projects            = QtLinguist