diff options
| author | Jerome Pasion <jerome.pasion@digia.com> | 2013-11-05 13:03:33 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-06 11:31:39 +0100 |
| commit | 5c389cecd07a4659670e3fefa34d717762dc3af1 (patch) | |
| tree | 55d84d481f0a189757dd758ff2beea45aa5d56a1 /qmake | |
| parent | f0841085e771f3915995af20b8473ebde992689f (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: Ifa55fcd9e402b0e184a41e316340e46aeb7101de
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/doc/qmake.qdocconf | 3 |
1 files changed, 1 insertions, 2 deletions
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 - |