diff options
| author | Jerome Pasion <jerome.pasion@digia.com> | 2013-11-05 13:36:47 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-06 10:57:30 +0100 |
| commit | d6b55368c6609434f9c5f24f9185c5abc5b8c209 (patch) | |
| tree | 189058323768c867166d4737a0c0acbd1db898cf | |
| parent | f422af85ef01c73b0ea08026448adf99171809d2 (diff) | |
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>
| -rw-r--r-- | src/assistant/assistant/doc/qtassistant.qdocconf | 2 | ||||
| -rw-r--r-- | src/assistant/help/doc/qthelp.qdocconf | 2 | ||||
| -rw-r--r-- | src/designer/src/designer/doc/qtdesigner.qdocconf | 2 | ||||
| -rw-r--r-- | src/designer/src/uitools/doc/qtuitools.qdocconf | 2 | ||||
| -rw-r--r-- | src/linguist/linguist/doc/qtlinguist.qdocconf | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/assistant/assistant/doc/qtassistant.qdocconf b/src/assistant/assistant/doc/qtassistant.qdocconf index 76cb67e7a..c9c3801a8 100644 --- 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 d62e24213..a5581a0b0 100644 --- 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 4d9b55d27..803e108a4 100644 --- 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 ebcd40b6f..89aa41ffe 100644 --- 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 9bb37c110..51e472a8a 100644 --- 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 |