Skip to content

Commit

Permalink
Doc: Rename documentation config files
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
toreinio committed Feb 7, 2017
1 parent 9889318 commit 2180a50
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions doc/doc.pri
Original file line number Diff line number Diff line change
@@ -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
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion doc/neptune-ui.qdocconf → doc/neptuneui.qdocconf
Original file line number Diff line number Diff line change
@@ -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" \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)

0 comments on commit 2180a50

Please sign in to comment.