From ba855463ab800c194ae581545535b46d5975bbb1 Mon Sep 17 00:00:00 2001 From: Casper van Donderen Date: Mon, 3 Sep 2012 11:00:19 +0200 Subject: [PATCH] Doc: Use settings from global qdocconf. Depends on the integration of #34077 Change-Id: I188d7617c4805d00226d0fb8d5768a02d24c6933 Reviewed-by: Geir Vattekar --- src/qml/doc/qtqml.qdocconf | 56 +++------------------------------------- src/quick/doc/qtquick.qdocconf | 51 +----------------------------------- 2 files changed, 6 insertions(+), 101 deletions(-) diff --git a/src/qml/doc/qtqml.qdocconf b/src/qml/doc/qtqml.qdocconf index 7cc65b7..c7f179c 100644 --- a/src/qml/doc/qtqml.qdocconf +++ b/src/qml/doc/qtqml.qdocconf @@ -1,17 +1,12 @@ include(global/qt-html-templates-offline.qdocconf) -include(global/qt-cpp-ignore.qdocconf) +include(global/qt-module-defaults.qdocconf) project = QtQml description = Qt QML Reference Documentation url = http://qt-project.org/doc/qt-5.0/qtqml version = 5.0.0 -sourceencoding = UTF-8 -outputencoding = UTF-8 -naturallanguage = en_US -qhp.projects = QtCore - -depends += qtcore qtxmlpatterns +qhp.projects = QtQml qhp.QtQml.file = qtqml.qhp qhp.QtQml.namespace = org.qt-project.qtqml.500 @@ -19,7 +14,7 @@ qhp.QtQml.virtualFolder = qdoc qhp.QtQml.indexTitle = Qt QML Reference Documentation qhp.QtQml.indexRoot = -qhp.QtQml.filterAttributes = qtcore 5.0.0 qtrefdoc +qhp.QtQml.filterAttributes = qtqml 5.0.0 qtrefdoc qhp.QtQml.customFilters.Qt.name = QtQml 5.0.0 qhp.QtQml.customFilters.Qt.filterAttributes = qtqml 5.0.0 qhp.QtQml.subprojects = classes overviews examples @@ -34,53 +29,10 @@ qhp.QtQml.subprojects.examples.title = Qt QML Examples qhp.QtQml.subprojects.examples.indexTitle = Qt QML Examples qhp.QtQml.subprojects.examples.selectors = fake:example -dita.metadata.default.author = Qt Project -dita.metadata.default.permissions = all -dita.metadata.default.publisher = Qt Project -dita.metadata.default.copyryear = 2012 -dita.metadata.default.copyrholder = Nokia -dita.metadata.default.audience = programmer - -sources.fileextensions = "*.c++ *.cc *.cpp *.cxx *.mm *.qml *.qdoc" -headers.fileextensions = "*.ch *.h *.h++ *.hh *.hpp *.hxx" - -examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml *.css" -examples.imageextensions = "*.png" - outputdir = ../../../doc/qtqml tagfile = ../../../doc/qtqml/qtcore.tags -HTML.generatemacrefs = "true" -HTML.nobreadcrumbs = "true" - -HTML.templatedir = . - -HTML.stylesheets = global/style/offline.css - -HTML.headerstyles = \ - " \n" - -HTML.endheader = \ - "\n" \ - -defines = Q_QDOC \ - QT_.*_SUPPORT \ - QT_.*_LIB \ - QT_COMPAT \ - QT_KEYPAD_NAVIGATION \ - QT_NO_EGL \ - Q_WS_.* \ - Q_OS_.* \ - Q_BYTE_ORDER \ - QT_DEPRECATED \ - QT_DEPRECATED_* \ - Q_NO_USING_KEYWORD \ - __cplusplus \ - Q_COMPILER_INITIALIZER_LISTS - -versionsym = QT_VERSION_STR - -codeindent = 1 +depends += qtcore qtxmlpatterns headerdirs += .. diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf index 24acb3e..ac9c0a9 100644 --- a/src/quick/doc/qtquick.qdocconf +++ b/src/quick/doc/qtquick.qdocconf @@ -1,16 +1,12 @@ include(global/qt-html-templates-offline.qdocconf) -include(global/qt-cpp-ignore.qdocconf) +include(global/qt-module-defaults.qdocconf) project = QtQuick description = Qt Quick Reference Documentation url = http://qt-project.org/doc/qt-5.0/qtquick version = 5.0.0 -depends += qtcore qtxmlpatterns qtqml -sourceencoding = UTF-8 -outputencoding = UTF-8 -naturallanguage = en_US qhp.projects = QtCore qhp.QtQuick.file = qtquick.qhp @@ -34,53 +30,10 @@ qhp.QtQuick.subprojects.examples.title = Qt Quick Examples qhp.QtQuick.subprojects.examples.indexTitle = Qt Quick Examples qhp.QtQuick.subprojects.examples.selectors = fake:example -dita.metadata.default.author = Qt Project -dita.metadata.default.permissions = all -dita.metadata.default.publisher = Qt Project -dita.metadata.default.copyryear = 2012 -dita.metadata.default.copyrholder = Nokia -dita.metadata.default.audience = programmer - -sources.fileextensions = "*.c++ *.cc *.cpp *.cxx *.mm *.qml *.qdoc" -headers.fileextensions = "*.ch *.h *.h++ *.hh *.hpp *.hxx" - -examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml *.css" -examples.imageextensions = "*.png" - outputdir = ../../../doc/qtquick tagfile = ../../../doc/qtquick/qtcore.tags -HTML.generatemacrefs = "true" -HTML.nobreadcrumbs = "true" - -HTML.templatedir = . - -HTML.stylesheets = global/style/offline.css - -HTML.headerstyles = \ - " \n" - -HTML.endheader = \ - "\n" \ - -defines = Q_QDOC \ - QT_.*_SUPPORT \ - QT_.*_LIB \ - QT_COMPAT \ - QT_KEYPAD_NAVIGATION \ - QT_NO_EGL \ - Q_WS_.* \ - Q_OS_.* \ - Q_BYTE_ORDER \ - QT_DEPRECATED \ - QT_DEPRECATED_* \ - Q_NO_USING_KEYWORD \ - __cplusplus \ - Q_COMPILER_INITIALIZER_LISTS - -versionsym = QT_VERSION_STR - -codeindent = 1 +depends += qtcore qtxmlpatterns qtqml headerdirs += .. -- 1.7.2.5