diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-01-29 11:47:04 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2013-01-29 12:49:37 +0100 |
| commit | 032ff5024ba544f2526b8e1d12c426e477b17e3b (patch) | |
| tree | f89f9a2204cd041c4ad9d89994f0a7016d582a29 | |
| parent | 7ec0b673c2b4e653c7fd20b2fa9c49c8383824bb (diff) | |
de-Creatorize doc configuration
Change-Id: I051a9f3f6b40be04fa917075a42bd4cfec3ef5ef
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
| -rw-r--r-- | doc/config/macros.qdocconf | 2 | ||||
| -rw-r--r-- | doc/config/qbs-project.qdocconf | 8 | ||||
| -rw-r--r-- | doc/doc.pri | 8 | ||||
| -rw-r--r-- | doc/qbs.qdoc | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/doc/config/macros.qdocconf b/doc/config/macros.qdocconf index 1997fd9c3..7dc0a90d3 100644 --- a/doc/config/macros.qdocconf +++ b/doc/config/macros.qdocconf @@ -21,7 +21,7 @@ macro.QL = "\\e{Qt Linguist}" macro.QMLD = "\\e{Qt Quick Designer}" macro.QQV = "\\e{Qt QML Viewer}" macro.QSDK = "\\e{Qt SDK}" -macro.qtcversion = $QTC_VERSION +macro.qbsversion = $QBS_VERSION macro.param = "\\e" macro.raisedaster.HTML = "<sup>*</sup>" macro.rarrow.HTML = "→" diff --git a/doc/config/qbs-project.qdocconf b/doc/config/qbs-project.qdocconf index b1acdd462..c6b56dc08 100644 --- a/doc/config/qbs-project.qdocconf +++ b/doc/config/qbs-project.qdocconf @@ -16,12 +16,12 @@ sources.fileextensions = "*.qdoc" qhp.projects = Qbs qhp.Qbs.file = qbs.qhp -qhp.Qbs.namespace = org.qt-project.qbs.$QTC_VERSION_TAG +qhp.Qbs.namespace = org.qt-project.qbs.$QBS_VERSION_TAG qhp.Qbs.virtualFolder = doc qhp.Qbs.indexTitle = Qt Build System -qhp.Qbs.filterAttributes = qbs $QTC_VERSION -qhp.Qbs.customFilters.Qbs.name = Qt Build System $QTC_VERSION -qhp.Qbs.customFilters.Qbs.filterAttributes = qbs $QTC_VERSION +qhp.Qbs.filterAttributes = qbs $QBS_VERSION +qhp.Qbs.customFilters.Qbs.name = Qt Build System $QBS_VERSION +qhp.Qbs.customFilters.Qbs.filterAttributes = qbs $QBS_VERSION qhp.Qbs.indexRoot = qhp.Qbs.subprojects = manual diff --git a/doc/doc.pri b/doc/doc.pri index fa1171783..a2871a232 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -13,15 +13,15 @@ HELPGENERATOR = $$targetPath($$[QT_INSTALL_BINS]/qhelpgenerator) VERSION_TAG = $$replace(QBS_VERSION, "[-.]", ) equals(QMAKE_DIR_SEP, /) { # unix, mingw+msys - QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html QTC_VERSION=$$QBS_VERSION QTC_VERSION_TAG=$$VERSION_TAG $$QDOC_BIN + QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html QBS_VERSION=$$QBS_VERSION QBS_VERSION_TAG=$$VERSION_TAG $$QDOC_BIN } else:win32-g++* { # just mingw # The lack of spaces in front of the && is necessary! - QDOC = set SRCDIR=$$PWD&& set OUTDIR=$$OUT_PWD/doc/html&& set QTC_VERSION=$$QBS_VERSION&& set QTC_VERSION_TAG=$$VERSION_TAG&& $$QDOC_BIN + QDOC = set SRCDIR=$$PWD&& set OUTDIR=$$OUT_PWD/doc/html&& set QBS_VERSION=$$QBS_VERSION&& set QBS_VERSION_TAG=$$VERSION_TAG&& $$QDOC_BIN } else { # nmake QDOC = set SRCDIR=$$PWD $$escape_expand(\\n\\t) \ set OUTDIR=$$OUT_PWD/doc/html $$escape_expand(\\n\\t) \ - set QTC_VERSION=$$QBS_VERSION $$escape_expand(\\n\\t) \ - set QTC_VERSION_TAG=$$VERSION_TAG $$escape_expand(\\n\\t) \ + set QBS_VERSION=$$QBS_VERSION $$escape_expand(\\n\\t) \ + set QBS_VERSION_TAG=$$VERSION_TAG $$escape_expand(\\n\\t) \ $$QDOC_BIN } diff --git a/doc/qbs.qdoc b/doc/qbs.qdoc index 0d9ba9187..feadd5fa7 100644 --- a/doc/qbs.qdoc +++ b/doc/qbs.qdoc @@ -41,7 +41,7 @@ \title Qbs Manual - \section1 Version \qtcversion + \section1 Version \qbsversion Qt Build Suite (qbs) is a tool that helps simplify the build process for developing projects across multiple platforms. Qbs can be used for any |