From e6fe0708006b5b1165bc4f93ce2c496bb92bbefc Mon Sep 17 00:00:00 2001 From: Casper van Donderen Date: Fri, 22 Jun 2012 10:51:44 +0200 Subject: [PATCH] Doc: Use correct style and modules for doc build. This change makes the "make docs" command use the correct style. Be aware that the "global" qdocconfs need to be in the QT_INSTALL_DOCS location before running "make docs", which effectively means that "make install" needs to be run in qtbase when doing a prefix build. Change-Id: Ib4635af0ad45717407a163968d629647898074dc Reviewed-by: Geir Vattekar --- src/qml/doc/qtqml.qdocconf | 7 +++++-- src/quick/doc/qtquick.qdocconf | 7 +++++-- src/quick/quick.pro | 1 + 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/qml/doc/qtqml.qdocconf b/src/qml/doc/qtqml.qdocconf index 80f7cef..7cc65b7 100644 --- a/src/qml/doc/qtqml.qdocconf +++ b/src/qml/doc/qtqml.qdocconf @@ -1,3 +1,6 @@ +include(global/qt-html-templates-offline.qdocconf) +include(global/qt-cpp-ignore.qdocconf) + project = QtQml description = Qt QML Reference Documentation url = http://qt-project.org/doc/qt-5.0/qtqml @@ -8,7 +11,7 @@ outputencoding = UTF-8 naturallanguage = en_US qhp.projects = QtCore -depends += qtcore qtjsbackend qtxmlpatterns qtquick +depends += qtcore qtxmlpatterns qhp.QtQml.file = qtqml.qhp qhp.QtQml.namespace = org.qt-project.qtqml.500 @@ -52,7 +55,7 @@ HTML.nobreadcrumbs = "true" HTML.templatedir = . -HTML.stylesheets = ../../../doc/global/style/offline.css +HTML.stylesheets = global/style/offline.css HTML.headerstyles = \ " \n" diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf index 4236278..9aa056e 100644 --- a/src/quick/doc/qtquick.qdocconf +++ b/src/quick/doc/qtquick.qdocconf @@ -1,9 +1,12 @@ +include(global/qt-html-templates-offline.qdocconf) +include(global/qt-cpp-ignore.qdocconf) + project = QtQuick description = Qt Quick Reference Documentation url = http://qt-project.org/doc/qt-5.0/qtquick version = 5.0.0 -depends += qtqcore qtxmlpatterns qtjsbackend qtqml +depends += qtqcore qtxmlpatterns qtqml sourceencoding = UTF-8 outputencoding = UTF-8 @@ -52,7 +55,7 @@ HTML.nobreadcrumbs = "true" HTML.templatedir = . -HTML.stylesheets = ../../../doc/global/style/offline.css +HTML.stylesheets = global/style/offline.css HTML.headerstyles = \ " \n" diff --git a/src/quick/quick.pro b/src/quick/quick.pro index e5ad858..5a0980b 100644 --- a/src/quick/quick.pro +++ b/src/quick/quick.pro @@ -20,6 +20,7 @@ exists("qqml_enable_gcov") { load(qt_module_config) QMAKE_DOCS = $$PWD/doc/qtquick.qdocconf +QMAKE_DOCS_INDEX = ../../doc # private dependencies QT += v8-private network -- 2.7.4