diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-01-30 15:22:03 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-06 09:44:53 +0100 |
| commit | 8a966f217a3adca9bef9113437e0e17c7a478cd2 (patch) | |
| tree | 8a43d8632d4f79ae5eed6ebd630650c8bd69f59b | |
| parent | 715366bc280bd627f990d9651c4f174dc0f48b0a (diff) | |
| download | qtdoc-8a966f217a3adca9bef9113437e0e17c7a478cd2.tar.gz | |
substitute fixed version numbers in qdocconf files with variables
Change-Id: I60ea78518820da332dda579d1a8ceece77d8ef8b
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| -rw-r--r-- | doc/config/online/qt-html-templates-online.qdocconf | 2 | ||||
| -rw-r--r-- | doc/config/qmake.qdocconf | 4 | ||||
| -rw-r--r-- | doc/config/qtdoc-project.qdocconf | 2 | ||||
| -rw-r--r-- | doc/config/qtdoc-qhp.qdocconf | 10 |
4 files changed, 9 insertions, 9 deletions
diff --git a/doc/config/online/qt-html-templates-online.qdocconf b/doc/config/online/qt-html-templates-online.qdocconf index bb967f4c..4d5dc203 100644 --- a/doc/config/online/qt-html-templates-online.qdocconf +++ b/doc/config/online/qt-html-templates-online.qdocconf @@ -17,7 +17,7 @@ HTML.postheader = \ " </div>\n" \ " <div id=\"shortCut\">\n" \ " <ul>\n" \ - " <li class=\"shortCut-topleft-inactive\"><span><a href=\"index.html\">Qt 5.0</a></span></li>\n" \ + " <li class=\"shortCut-topleft-inactive\"><span><a href=\"index.html\">Qt $QT_VER</a></span></li>\n" \ " <li class=\"shortCut-topleft-active\"><a href=\"http://qt-project.org/doc/\">ALL VERSIONS" \ " </a></li>\n" \ " </ul>\n" \ diff --git a/doc/config/qmake.qdocconf b/doc/config/qmake.qdocconf index f6d8dd38..80ccdab9 100644 --- a/doc/config/qmake.qdocconf +++ b/doc/config/qmake.qdocconf @@ -13,7 +13,7 @@ indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index qhp.projects = qmake qhp.qmake.file = qmake.qhp -qhp.qmake.namespace = org.qt-project.qmake.501 +qhp.qmake.namespace = org.qt-project.qmake.$QT_VERSION_TAG qhp.qmake.virtualFolder = qmake qhp.qmake.indexTitle = QMake Manual qhp.qmake.extraFiles = images/bg_l.png \ @@ -50,7 +50,7 @@ qhp.qmake.extraFiles = images/bg_l.png \ style/style_ie8.css \ style/style.css -qhp.qmake.filterAttributes = qt 5.0.1 tools qmake +qhp.qmake.filterAttributes = qt $QT_VERSION tools qmake qhp.qmake.customFilters.qmake.name = qmake Manual qhp.qmake.customFilters.qmake.filterAttributes = qt tools qmake qhp.qmake.subprojects = manual diff --git a/doc/config/qtdoc-project.qdocconf b/doc/config/qtdoc-project.qdocconf index 6bb54ee7..e7640159 100644 --- a/doc/config/qtdoc-project.qdocconf +++ b/doc/config/qtdoc-project.qdocconf @@ -1,7 +1,7 @@ project = QtDoc description = Qt Reference Documentation url = http://qt-project.org/doc/qtdoc -version = 5.0.1 +version = $QT_VERSION depends += \ activeqt \ diff --git a/doc/config/qtdoc-qhp.qdocconf b/doc/config/qtdoc-qhp.qdocconf index 2021810d..95d9546f 100644 --- a/doc/config/qtdoc-qhp.qdocconf +++ b/doc/config/qtdoc-qhp.qdocconf @@ -1,14 +1,14 @@ qhp.projects = QtDoc qhp.QtDoc.file = qtdoc.qhp -qhp.QtDoc.namespace = org.qt-project.qtdoc.501 +qhp.QtDoc.namespace = org.qt-project.qtdoc.$QT_VERSION_TAG qhp.QtDoc.virtualFolder = qtdoc -qhp.QtDoc.indexTitle = Qt 5.0 Reference Documentation +qhp.QtDoc.indexTitle = Qt $QT_VERSION Reference Documentation qhp.QtDoc.indexRoot = -qhp.QtDoc.filterAttributes = qtdoc 5.0.1 qtrefdoc -qhp.QtDoc.customFilters.Qt.name = Qtdoc 5.0.1 -qhp.QtDoc.customFilters.Qt.filterAttributes = qtdoc 5.0.1 +qhp.QtDoc.filterAttributes = qtdoc $QT_VERSION qtrefdoc +qhp.QtDoc.customFilters.Qt.name = Qtdoc $QT_VERSION +qhp.QtDoc.customFilters.Qt.filterAttributes = qtdoc $QT_VERSION qhp.QtDoc.subprojects = classes qmltypes examples qhp.QtDoc.subprojects.classes.title = Classes qhp.QtDoc.subprojects.classes.indexTitle = All Classes |