diff options
author | Topi Reinio <topi.reinio@theqtcompany.com> | 2016-02-03 12:20:59 +0100 |
---|---|---|
committer | Topi Reiniƶ <topi.reinio@theqtcompany.com> | 2016-02-03 12:49:02 +0000 |
commit | 7207078b83c79cba7e6cec3967bf9308b9267ffb (patch) | |
tree | 275d3b83f6b2346e1e9bf8b6b0b8aa024f7328c7 /src/virtualkeyboard | |
parent | cef8d8d0398b883f61104a4ed047f387225514a1 (diff) |
Doc: Use a standard documentation config for a Qt module
- Rename index.html to qtvirtualkeyboard-index.html
- Use the qt-module-defaults global doc template
- Remove custom URL/version info
- Use a namespace consistent with the rest of Qt modules
- Update examplesinstallpath to the changes introduced
in Qt 5.6 packaging.
Change-Id: I83e920fb6dea3f303c901cd782f3f7223fe5c2a5
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Diffstat (limited to 'src/virtualkeyboard')
-rw-r--r-- | src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf | 22 | ||||
-rw-r--r-- | src/virtualkeyboard/doc/src/qtvirtualkeyboard-index.qdoc | 2 |
2 files changed, 8 insertions, 16 deletions
diff --git a/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf b/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf index a20d3b33..4fccd3b2 100644 --- a/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf +++ b/src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf @@ -1,14 +1,8 @@ -include($QT_INSTALL_DOCS/global/macros.qdocconf) -include($QT_INSTALL_DOCS/global/compat.qdocconf) -include($QT_INSTALL_DOCS/global/fileextensions.qdocconf) -include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf) -include($QT_INSTALL_DOCS/global/qt-cpp-defines.qdocconf) +include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtVirtualKeyboard description = Qt Virtual Keyboard -url = http://doc.qt.io/QtVirtualKeyboard/ - -version = 2.0 +version = $QT_VERSION headerdirs += .. sourcedirs += .. @@ -16,11 +10,9 @@ excludedirs += ../content/layouts \ ../3rdparty # Specify the install path under QT_INSTALL_EXAMPLES -# Examples will be installed under quick/enterprise/virtualkeyboard - -# 'enterprise/virtualkeyboard' subdirectory is given as part of \example commands exampledirs += ../../../examples/quick \ snippets -examplesinstallpath = quick +examplesinstallpath = qtvirtualkeyboard/quick imagedirs += images depends += qtcore qtgui qtquick @@ -28,14 +20,14 @@ depends += qtcore qtgui qtquick qhp.projects = QtVirtualKeyboard qhp.QtVirtualKeyboard.file = qtvirtualkeyboard.qhp -qhp.QtVirtualKeyboard.namespace = com.digia.qtvirtualkeyboard.200 +qhp.QtVirtualKeyboard.namespace = org.qt-project.qtvirtualkeyboard.$QT_VERSION_TAG qhp.QtVirtualKeyboard.virtualFolder = qtvirtualkeyboard qhp.QtVirtualKeyboard.indexTitle = Qt Virtual Keyboard qhp.QtVirtualKeyboard.indexRoot = -qhp.QtVirtualKeyboard.filterAttributes = qtvirtualkeyboard 2.0 qtrefdoc -qhp.QtVirtualKeyboard.customFilters.Qt.name = QtVirtualKeyboard 2.0 -qhp.QtVirtualKeyboard.customFilters.Qt.filterAttributes = qtvirtualkeyboard 2.0 +qhp.QtVirtualKeyboard.filterAttributes = qtvirtualkeyboard $QT_VERSION qtrefdoc +qhp.QtVirtualKeyboard.customFilters.Qt.name = QtVirtualKeyboard $QT_VERSION +qhp.QtVirtualKeyboard.customFilters.Qt.filterAttributes = qtvirtualkeyboard $QT_VERSION qhp.QtVirtualKeyboard.subprojects = classes qmltypes examples diff --git a/src/virtualkeyboard/doc/src/qtvirtualkeyboard-index.qdoc b/src/virtualkeyboard/doc/src/qtvirtualkeyboard-index.qdoc index a5a36683..7248c8ff 100644 --- a/src/virtualkeyboard/doc/src/qtvirtualkeyboard-index.qdoc +++ b/src/virtualkeyboard/doc/src/qtvirtualkeyboard-index.qdoc @@ -29,7 +29,7 @@ /*! \title Qt Virtual Keyboard - \page index.html + \page qtvirtualkeyboard-index.html The Qt Virtual Keyboard project provides an input framework and reference keyboard frontend for Qt 5 on Linux Desktop/X11 or Boot2Qt targets. |