diff options
author | Jerome Pasion <jerome.pasion@digia.com> | 2013-11-05 13:12:18 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-06 10:55:07 +0100 |
commit | 0910eb9a769fbcf437dd86db2385496b498e752f (patch) | |
tree | 6c210d3ed0fa5736c3d0b79a19ef99839ce858ec | |
parent | 3ca1d7274328642cd69b0da6891be14880e2f542 (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: I8ee21679bc4990bb8c81d8e4a7233d7ec2824ba7
Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
-rw-r--r-- | src/bluetooth/doc/qtbluetooth.qdocconf | 2 | ||||
-rw-r--r-- | src/nfc/doc/qtnfc.qdocconf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/bluetooth/doc/qtbluetooth.qdocconf b/src/bluetooth/doc/qtbluetooth.qdocconf index 45c0d3b4..36e8cb6f 100644 --- a/src/bluetooth/doc/qtbluetooth.qdocconf +++ b/src/bluetooth/doc/qtbluetooth.qdocconf @@ -2,7 +2,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtBluetooth description = Qt Bluetooth Reference Documentation -url = http://qt-project.org/doc/qt-$QT_VER/qtbluetooth +url = http://qt-project.org/doc/qt-$QT_VER version = $QT_VERSION examplesinstallpath = bluetooth diff --git a/src/nfc/doc/qtnfc.qdocconf b/src/nfc/doc/qtnfc.qdocconf index e136ddf7..2d5b0ef5 100644 --- a/src/nfc/doc/qtnfc.qdocconf +++ b/src/nfc/doc/qtnfc.qdocconf @@ -2,7 +2,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtNfc description = Qt NFC Reference Documentation -url = http://qt-project.org/doc/qt-$QT_VER/qtnfc +url = http://qt-project.org/doc/qt-$QT_VER version = $QT_VERSION examplesinstallpath = nfc |