From d598f850f9fad6a33dae622ce11a01b8585fe790 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Tue, 24 Feb 2015 15:25:37 +0100 Subject: Doc: Add configuration for building online docs Add a new configuration file, b2qt-online.qdocconf that is selected for use whenever 'build_online_docs' CONFIG flag is set. Separate the common parts of doc config into b2qt-project.qdocconf, and clean it up by removing unnecessary variables. Change-Id: I001eee79b5322b515e568b90ee0d36aaf60c53c3 Reviewed-by: Eirik Aavitsland --- src/doc/config/b2qt-online.qdocconf | 5 ++++ src/doc/config/b2qt-project.qdocconf | 45 ++++++++++++++++++++++++++++++ src/doc/config/b2qt.qdocconf | 53 +----------------------------------- src/doc/doc.pro | 8 +++++- 4 files changed, 58 insertions(+), 53 deletions(-) create mode 100644 src/doc/config/b2qt-online.qdocconf create mode 100644 src/doc/config/b2qt-project.qdocconf diff --git a/src/doc/config/b2qt-online.qdocconf b/src/doc/config/b2qt-online.qdocconf new file mode 100644 index 0000000..a75cde2 --- /dev/null +++ b/src/doc/config/b2qt-online.qdocconf @@ -0,0 +1,5 @@ +include($QT_INSTALL_DOCS/global/qt-module-defaults-online-commercial.qdocconf) +include(b2qt-project.qdocconf) + +# sidebar used for online template +HTML.stylesheets += style/qt5-sidebar.html diff --git a/src/doc/config/b2qt-project.qdocconf b/src/doc/config/b2qt-project.qdocconf new file mode 100644 index 0000000..471096e --- /dev/null +++ b/src/doc/config/b2qt-project.qdocconf @@ -0,0 +1,45 @@ +project = QtForDeviceCreation +description = Qt 5.4 for Device Creation +version = 4.1.0 + +sourcedirs += ../src \ + ../../imports/wifi \ + ../../imports/utils \ + ../../wifi + +headerdirs += ../../wifi + +exampledirs += ../../../examples + +imagedirs += ../images + +indexes = $QT_INSTALL_DOCS/qtquick/qtquick.index \ + $QT_INSTALL_DOCS/qtgui/qtgui.index \ + $QT_INSTALL_DOCS/qtcore/qtcore.index \ + $QT_INSTALL_DOCS/qtserialport/qtserialport.index \ + $QT_INSTALL_DOCS/emulator/emulator.index \ + $QT_INSTALL_DOCS/qtwebengine/qtwebengine.index \ + $QT_INSTALL_DOCS/qtquickcontrols/qtquickcontrols.index + +qhp.projects = B2Qt + +qhp.B2Qt.file = b2qt.qhp +qhp.B2Qt.namespace = com.digia.b2qt.410 +qhp.B2Qt.virtualFolder = b2qt +qhp.B2Qt.indexTitle = Qt 5.4 for Device Creation +qhp.B2Qt.indexRoot = + +qhp.B2Qt.subprojects = manual +qhp.B2Qt.subprojects.manual.title = Qt 5.4 for Device Creation +qhp.B2Qt.subprojects.manual.indexTitle = Qt 5.4 for Device Creation +qhp.B2Qt.subprojects.manual.type = manual + +macro.B2Q = "Boot to Qt" +macro.SDK = "Qt for Device Creation" +macro.B2QA = "\\e {Boot to Qt for embedded Android}" +macro.B2QL = "\\e {Boot to Qt for embedded Linux}" + +navigation.landingpage = "Qt 5.4 for Device Creation" +navigation.qmltypespage = "Add-On Modules" + +Cpp.ignoredirectives += Q_DECLARE_LOGGING_CATEGORY diff --git a/src/doc/config/b2qt.qdocconf b/src/doc/config/b2qt.qdocconf index b57af1e..f7c8df0 100644 --- a/src/doc/config/b2qt.qdocconf +++ b/src/doc/config/b2qt.qdocconf @@ -1,53 +1,2 @@ include(html-offline.qdocconf) - -naturallanguage = en_US -outputencoding = UTF-8 -sourceencoding = UTF-8 - -project = QtForDeviceCreation -description = Qt 5.4 for Device Creation -version = 4.1.0 - -sourcedirs = ../src \ - ../../imports/wifi \ - ../../imports/utils \ - ../../wifi - -headerdirs += ../../wifi - -exampledirs += ../../../examples - -imagedirs += ../images - -indexes = $QT_INSTALL_DOCS/qtquick/qtquick.index \ - $QT_INSTALL_DOCS/qtgui/qtgui.index \ - $QT_INSTALL_DOCS/qtcore/qtcore.index \ - $QT_INSTALL_DOCS/qtserialport/qtserialport.index \ - $QT_INSTALL_DOCS/emulator/emulator.index \ - $QT_INSTALL_DOCS/qtwebengine/qtwebengine.index \ - $QT_INSTALL_DOCS/qtquickcontrols/qtquickcontrols.index - -qhp.projects = B2Qt - -qhp.B2Qt.file = b2qt.qhp -qhp.B2Qt.namespace = com.digia.b2qt.410 -qhp.B2Qt.virtualFolder = b2qt -qhp.B2Qt.indexTitle = Qt 5.4 for Device Creation -qhp.B2Qt.indexRoot = - -qhp.B2Qt.subprojects = manual -qhp.B2Qt.subprojects.manual.title = Qt 5.4 for Device Creation -qhp.B2Qt.subprojects.manual.indexTitle = Qt 5.4 for Device Creation -qhp.B2Qt.subprojects.manual.type = manual - -macro.B2Q = "Boot to Qt" -macro.SDK = "Qt for Device Creation" -macro.B2QA = "\\e {Boot to Qt for embedded Android}" -macro.B2QL = "\\e {Boot to Qt for embedded Linux}" - -navigation.landingpage = "Qt 5.4 for Device Creation" -navigation.qmltypespage = "Add-On Modules" - -Cpp.ignoredirectives += Q_DECLARE_LOGGING_CATEGORY - -HTML.stylesheets += style/qt5-sidebar.html +include(b2qt-project.qdocconf) diff --git a/src/doc/doc.pro b/src/doc/doc.pro index 36dc209..a2fe144 100644 --- a/src/doc/doc.pro +++ b/src/doc/doc.pro @@ -1,3 +1,9 @@ TEMPLATE = aux -QMAKE_DOCS = $$PWD/config/b2qt.qdocconf +build_online_docs: { + QMAKE_DOCS_TARGETDIR = b2qt + QMAKE_DOCS = $$PWD/config/b2qt-online.qdocconf +} else { + QMAKE_DOCS = $$PWD/config/b2qt.qdocconf +} + QMAKE_DOCS_OUTPUTDIR = $$OUT_PWD/b2qt -- cgit v1.2.3