diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2017-02-06 13:50:41 +0100 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@qt.io> | 2017-02-07 08:33:42 +0000 |
| commit | 2180a504ec446627467d0e22f5f5c6fb6689c67b (patch) | |
| tree | 4204895dfd680aa506aaca943e576c1e11b11178 | |
| parent | 9889318dd059b4e3be922b73eb4c9379f61a1ae2 (diff) | |
Doc: Rename documentation config files
Documentation build system expects the output directory name to
match with the (lowercased) qdocconf project name. The outputdir
is generated from the .qdocconf filename(s); renaming them allows
other doc modules to find the index file for the 'neptuneui'
dependency.
Change-Id: I395baf44bccc77c38dab74fca4926701961d3f85
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| -rw-r--r-- | doc/doc.pri | 4 | ||||
| -rw-r--r-- | doc/neptuneui-project.qdocconf (renamed from doc/neptune-ui-project.qdocconf) | 0 | ||||
| -rw-r--r-- | doc/neptuneui.qdocconf (renamed from doc/neptune-ui.qdocconf) | 2 | ||||
| -rw-r--r-- | doc/online/neptuneui.qdocconf (renamed from doc/online/neptune-ui.qdocconf) | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index 13c3684..5b56ae7 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -1,8 +1,8 @@ isEmpty(VERSION): VERSION=1.0.0 build_online_docs: { - QMAKE_DOCS = $$PWD/online/neptune-ui.qdocconf + QMAKE_DOCS = $$PWD/online/neptuneui.qdocconf } else { - QMAKE_DOCS = $$PWD/neptune-ui.qdocconf + QMAKE_DOCS = $$PWD/neptuneui.qdocconf } CONFIG += prepare_docs diff --git a/doc/neptune-ui-project.qdocconf b/doc/neptuneui-project.qdocconf index 2d644be..2d644be 100644 --- a/doc/neptune-ui-project.qdocconf +++ b/doc/neptuneui-project.qdocconf diff --git a/doc/neptune-ui.qdocconf b/doc/neptuneui.qdocconf index c39cf92..c8166e0 100644 --- a/doc/neptune-ui.qdocconf +++ b/doc/neptuneui.qdocconf @@ -1,5 +1,5 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults-offline.qdocconf) -include(neptune-ui-project.qdocconf) +include(neptuneui-project.qdocconf) HTML.footer = \ " </div>\n" \ diff --git a/doc/online/neptune-ui.qdocconf b/doc/online/neptuneui.qdocconf index da52564..f679282 100644 --- a/doc/online/neptune-ui.qdocconf +++ b/doc/online/neptuneui.qdocconf @@ -21,6 +21,6 @@ include($QT_INSTALL_DOCS/global/html-footer-online.qdocconf) # override defaults for Qt module documentation HTML.nosubdirs = "false" -HTML.outputsubdir = "neptune-ui" +HTML.outputsubdir = "neptuneui" -include(../neptune-ui-project.qdocconf) +include(../neptuneui-project.qdocconf) |