aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/doc.pri3
-rw-r--r--doc/doc.pro2
-rw-r--r--doc/neptune-ui-project.qdocconf2
-rw-r--r--doc/neptune-ui.qdocconf2
-rw-r--r--doc/online/neptune-ui.qdocconf (renamed from doc/neptune-ui-online.qdocconf)14
5 files changed, 15 insertions, 8 deletions
diff --git a/doc/doc.pri b/doc/doc.pri
index aa3c762..13c3684 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -1,7 +1,6 @@
isEmpty(VERSION): VERSION=1.0.0
build_online_docs: {
- QMAKE_DOCS_TARGETDIR = html
- QMAKE_DOCS = $$PWD/neptune-ui-online.qdocconf
+ QMAKE_DOCS = $$PWD/online/neptune-ui.qdocconf
} else {
QMAKE_DOCS = $$PWD/neptune-ui.qdocconf
}
diff --git a/doc/doc.pro b/doc/doc.pro
new file mode 100644
index 0000000..0d8b598
--- /dev/null
+++ b/doc/doc.pro
@@ -0,0 +1,2 @@
+TEMPLATE = aux
+include(doc.pri)
diff --git a/doc/neptune-ui-project.qdocconf b/doc/neptune-ui-project.qdocconf
index 2e15eb5..2d644be 100644
--- a/doc/neptune-ui-project.qdocconf
+++ b/doc/neptune-ui-project.qdocconf
@@ -1,6 +1,6 @@
project = NeptuneUI
version = $QT_VERSION
-url = http://doc.qt.io/neptuneui
+url = http://doc.qt.io/NeptuneUI
sourcedirs += src
diff --git a/doc/neptune-ui.qdocconf b/doc/neptune-ui.qdocconf
index 6f81a65..c39cf92 100644
--- a/doc/neptune-ui.qdocconf
+++ b/doc/neptune-ui.qdocconf
@@ -9,7 +9,7 @@ HTML.footer = \
"</div>\n" \
"<div class=\"footer\">\n" \
" <p>\n" \
- " <acronym title=\"Copyright\">&copy;</acronym> 2016 Pelagicore AG.\n" \
+ " <acronym title=\"Copyright\">&copy;</acronym> 2017 Pelagicore AG.\n" \
" Documentation contributions included herein are the copyrights of\n" \
" their respective owners.<br>" \
" The documentation provided herein is licensed under the terms of the" \
diff --git a/doc/neptune-ui-online.qdocconf b/doc/online/neptune-ui.qdocconf
index 6720923..da52564 100644
--- a/doc/neptune-ui-online.qdocconf
+++ b/doc/online/neptune-ui.qdocconf
@@ -1,8 +1,9 @@
+include($QT_INSTALL_DOCS/global/qt-module-defaults-online.qdocconf)
HTML.footer = \
" </div>\n" \
" <p class=\"copy-notice\">\n" \
- " <acronym title=\"Copyright\">&copy;</acronym> 2016 Pelagicore AG.\n" \
+ " <acronym title=\"Copyright\">&copy;</acronym> 2017 Pelagicore AG.\n" \
" Documentation contributions included herein are the copyrights of\n" \
" their respective owners. " \
" The documentation provided herein is licensed under the terms of the" \
@@ -12,9 +13,14 @@ HTML.footer = \
" in Finland and/or other countries worldwide. All other trademarks are property\n" \
" of their respective owners. </p>\n"
-include($QT_INSTALL_DOCS/global/qt-module-defaults-online.qdocconf)
+# online site footer
+include($QT_INSTALL_DOCS/global/html-footer-online.qdocconf)
# Add an .html file with sidebar content, used in the online style
-HTML.stylesheets += style/qt5-sidebar.html
+#HTML.stylesheets += style/qt5-sidebar.html
+
+# override defaults for Qt module documentation
+HTML.nosubdirs = "false"
+HTML.outputsubdir = "neptune-ui"
-include(neptune-ui-project.qdocconf)
+include(../neptune-ui-project.qdocconf)