slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix up a few doc issues

Browse Source 
* lingering references to Mobility
* missing group tags on some classes meant they went missing
* put classes into functional groups as well (e.g. audio, camera)
* added some of the qdoc files to OTHER_FILES so they show up in Creator

There are still a lot of warnings since it seems like qdoc is not
processing the controls directory.

Change-Id: I036f8826ae63f8273b3e649cb32c091d964ce830
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Michael Goddard
2012-01-16 16:27:32 +10:00
committed by Qt by Nokia
parent 53d71baed3
commit 508ca28196
89 changed files with 238 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
doc/config/qtmobility-cpp-ignore.qdocconf
View File

@@ -1,18 +0,0 @@
Cpp.ignoretokens += \
QTM_BEGIN_NAMESPACE \
QTM_END_NAMESPACE \
Q_BEARER_EXPORT \
Q_PUBLISHSUBSCRIBE_EXPORT \
Q_CONTACTS_EXPORT \
Q_VERSIT_EXPORT \
Q_LOCATION_EXPORT \
Q_MULTIMEDIA_EXPORT \
Q_MESSAGING_EXPORT \
Q_SERVICEFW_EXPORT \
Q_SYSINFO_EXPORT \
Q_SENSORS_EXPORT \
Q_FEEDBACK_EXPORT \
Q_GALLERY_EXPORT \
Q_ORGANIZER_EXPORT
Cpp.ignoredirectives += \
Q_DECLARE_NDEF_RECORD

13
doc/config/qtmobility-ditaxml.qdocconf
View File

@@ -1,13 +0,0 @@
include(qtmobility-project.qdocconf)
outputdir = ../ditaxml
outputformats = DITAXML
generateindex = true
url = .
macro.beginfloatleft.HTML = " "
macro.beginfloatright.HTML = " "
macro.endfloat.HTML = " "
macro.clearfloat.HTML = " "
macro.emptyspan.DITAXML = " "

2
doc/config/qtmobility-online.qdocconf
View File

@@ -1,2 +0,0 @@
include(qtmobility-project.qdocconf)
include(qt-html-templates-online.qdocconf)

142
doc/config/qtmobility-project.qdocconf
View File

@@ -1,142 +0,0 @@
include(compat.qdocconf)
include(macros.qdocconf)
include(qt-cpp-ignore.qdocconf)
include(qt-defines.qdocconf)
include(qtmobility-cpp-ignore.qdocconf)
indexes = ../src/qt.index
language = Cpp
sourceencoding = UTF-8
outputencoding = UTF-8
naturallanguage = en_US
project = Qt Mobility
description = Qt Mobility Project Library Reference Documentation
versionsym =
version = 1.2
url = http://qt.nokia.com/doc/qtmobility-1.2
sources.fileextensions = "*.cpp *.qdoc *.mm *.qml"
headers.fileextensions = "*.ch *.h *.h++ *.hh *.hpp *.hxx"
examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml"
examples.imageextensions = "*.png *.jpeg *.jpg *.gif *.mng"
headerdirs = ../../src/global \
../../src/bearer \
../../src/feedback \
../../src/serviceframework \
../../src/location \
../../src/publishsubscribe \
../../src/systeminfo \
../../src/contacts \
../../src/contacts/details \
../../src/multimedia \
../../plugins/declarative/multimedia \
../../plugins/declarative/location \
../../plugins/declarative/organizer \
../../plugins/declarative/connectivity \
../../plugins/declarative/contacts \
../../plugins/declarative/contacts/details \
../../plugins/declarative/contacts/filters \
../../plugins/declarative/gallery \
../../plugins/declarative/serviceframework \
../../plugins/declarative/organizer \
../../plugins/declarative/contacts \
../../plugins/declarative/feedback \
../../plugins/declarative/messaging \
../../plugins/declarative/sensors \
../../plugins/declarative/publishsubscribe \
../../plugins/declarative/systeminfo \
../../src/messaging \
../../src/versit \
../../src/sensors \
../../src/gallery \
../../src/camera \
../../src/organizer \
../../src/versitorganizer \
../../src/connectivity \
../src
sourcedirs = ../../src/global \
../../src/bearer \
../../src/feedback \
../../src/serviceframework \
../../src/location \
../../src/publishsubscribe \
../../src/systeminfo \
../../src/contacts \
../../src/contacts/details \
../../src/multimedia \
../../plugins/declarative/multimedia \
../../plugins/declarative/location \
../../plugins/declarative/organizer \
../../plugins/declarative/connectivity \
../../plugins/declarative/contacts \
../../plugins/declarative/contacts/details \
../../plugins/declarative/contacts/filters \
../../plugins/declarative/messaging \
../../plugins/declarative/serviceframework \
../../plugins/declarative/organizer \
../../plugins/declarative/contacts \
../../plugins/declarative/feedback \
../../plugins/declarative/gallery \
../../plugins/declarative/sensors \
../../plugins/declarative/publishsubscribe \
../../plugins/declarative/systeminfo \
../../plugins/declarative/sensors \
../../src/messaging \
../../src/versit \
../../src/sensors \
../../src/gallery \
../../src/camera \
../../src/organizer \
../../src/connectivity \
../../src/versitorganizer \
../src
excludedirs = ../../src/messaging/win32wce \
../../src/publishsubscribe/symbian \
../../src/serviceframework/ipc/metaobjectbuilder47
exampledirs = ../../examples \
../../demos \
../.. \
../src
imagedirs = images \
../src/images
outputdir = ../html
tagfile = ../html/qtmobility.tags
base = file:../html
qhp.projects = QtMobility
qhp.QtMobility.file = qtmobility.qhp
qhp.QtMobility.namespace = com.nokia.qtmobility.114
qhp.QtMobility.virtualFolder = mobility
qhp.QtMobility.indexTitle = Qt Mobility Project Reference Documentation
qhp.QtMobility.indexRoot =
qhp.QtMobility.filterAttributes = qtmobility 1.2.0
qhp.QtMobility.customFilters.QtMobility.name = Qt Mobility 1.2.0
qhp.QtMobility.customFilters.QtMobility.filterAttributes = qtmobility 1.2.0
qhp.QtMobility.subprojects = classes overviews examples
qhp.QtMobility.subprojects.classes.title = Classes
qhp.QtMobility.subprojects.classes.indexTitle = All Qt Mobility Project Classes
qhp.QtMobility.subprojects.classes.selectors = class
qhp.QtMobility.subprojects.classes.sortPages = true
qhp.QtMobility.subprojects.overviews.title = Overviews
qhp.QtMobility.subprojects.overviews.indexTitle = Qt Mobility Project Overview
qhp.QtMobility.subprojects.overviews.selectors = fake:page,group
qhp.QtMobility.subprojects.overviews.sortPages = true
qhp.QtMobility.subprojects.examples.title = Examples
qhp.QtMobility.subprojects.examples.indexTitle = Qt Mobility Project Examples
qhp.QtMobility.subprojects.examples.selectors = fake:example
qhp.QtMobility.subprojects.examples.sortPages = true
qhp.QtMobility.subprojects.tutorials.title = Tutorials
qhp.QtMobility.subprojects.tutorials.indexTitle = Qt Mobility Project Tutorials
qhp.QtMobility.subprojects.tutorials.selectors = fake:tutorial
qhp.QtMobility.subprojects.tutorials.sortPages = true

2
doc/config/qtmobility.qdocconf
View File

@@ -1,2 +0,0 @@
include(qtmobility-project.qdocconf)
include(qt-html-templates.qdocconf)

8
doc/config/qtmultimedia_doc.pri
View File

@@ -33,3 +33,11 @@ QMAKE_EXTRA_TARGETS += docs dita_docs online_docs qch_docs
QMAKE_CLEAN += \
"-r $$PWD/../html" \
"-r $$PWD/../ditaxml"
OTHER_FILES += \
doc/src/multimedia.qdoc \
doc/src/camera.qdoc \
doc/src/multimediabackend.qdoc \
doc/src/radiooverview.qdoc \
doc/src/plugins/qml-multimedia.qdoc