diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2012-11-20 10:21:07 +0100 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2012-11-20 10:21:44 +0100 |
| commit | bcdaf070ba43c372664ef385d4cb154d020df264 (patch) | |
| tree | 9ef054ed593c285e3109f56ae1f922e837f6f292 | |
| parent | fcbc6043f102dce56f0c457748f489e7e2bd0c0b (diff) | |
| parent | c60ae1702e4471e9c302ced7caf8dccff0b67b8d (diff) | |
| download | qtgraphicaleffects-bcdaf070ba43c372664ef385d4cb154d020df264.tar.gz | |
Merge branch 'newdocs'
Change-Id: If1ebf43ab59293eb86db2a1ffab5677c708cb93e
| -rw-r--r-- | qtgraphicaleffects.pro | 2 | ||||
| -rw-r--r-- | src/effects/doc/qtgraphicaleffects.qdocconf | 30 | ||||
| -rw-r--r-- | src/effects/effects.pro | 1 |
3 files changed, 13 insertions, 20 deletions
diff --git a/qtgraphicaleffects.pro b/qtgraphicaleffects.pro index d60c8c7..58c33f2 100644 --- a/qtgraphicaleffects.pro +++ b/qtgraphicaleffects.pro @@ -1,3 +1 @@ load(qt_parts) - -include(doc/doc.pri) diff --git a/src/effects/doc/qtgraphicaleffects.qdocconf b/src/effects/doc/qtgraphicaleffects.qdocconf index c9b523e..96ffeca 100644 --- a/src/effects/doc/qtgraphicaleffects.qdocconf +++ b/src/effects/doc/qtgraphicaleffects.qdocconf @@ -1,35 +1,29 @@ -include(../../../doc/global/qt-html-templates-offline.qdocconf) -include(../../../doc/global/qt-module-defaults.qdocconf) +include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtGraphicalEffects description = Qt Graphical Effects Reference Documentation -url = http://qt-project.org/doc/qt-5.0/qtgraphicaleffects-index.html +url = http://qt-project.org/doc/qtgraphicaleffects/ version = 5.0.0 qhp.projects = QtGraphicalEffects qhp.QtGraphicalEffects.file = qtgraphicaleffects.qhp qhp.QtGraphicalEffects.namespace = org.qt-project.qtgraphicaleffects.500 -qhp.QtGraphicalEffects.virtualFolder = qdoc -qhp.QtGraphicalEffects.indexTitle = Qt Graphical Effects Reference Documentation +qhp.QtGraphicalEffects.virtualFolder = qtgraphicaleffects +qhp.QtGraphicalEffects.indexTitle = Qt Graphical Effects qhp.QtGraphicalEffects.indexRoot = qhp.QtGraphicalEffects.filterAttributes = qtgraphicaleffects 5.0.0 qtrefdoc qhp.QtGraphicalEffects.customFilters.Qt.name = QtGraphicalEffects 5.0.0 qhp.QtGraphicalEffects.customFilters.Qt.filterAttributes = qtgraphicaleffects 5.0.0 -qhp.QtGraphicalEffects.subprojects = classes overviews examples -qhp.QtGraphicalEffects.subprojects.classes.title = Classes -qhp.QtGraphicalEffects.subprojects.classes.indexTitle = Qt Graphical Effects's Classes -qhp.QtGraphicalEffects.subprojects.classes.selectors = class fake:headerfile -qhp.QtGraphicalEffects.subprojects.classes.sortPages = true -qhp.QtGraphicalEffects.subprojects.overviews.title = Overviews -qhp.QtGraphicalEffects.subprojects.overviews.indexTitle = All Overviews and HOWTOs -qhp.QtGraphicalEffects.subprojects.overviews.selectors = fake:page,group,module -qhp.QtGraphicalEffects.subprojects.examples.title = Qt Graphical Effects Examples -qhp.QtGraphicalEffects.subprojects.examples.indexTitle = Qt Graphical Effects Examples -qhp.QtGraphicalEffects.subprojects.examples.selectors = fake:example - -outputdir = ../../../doc/qtgraphicaleffects + +qhp.QtGraphicalEffects.subprojects = qmltypes +qhp.QtGraphicalEffects.subprojects.qmltypes.title = QML Types +qhp.QtGraphicalEffects.subprojects.qmltypes.indexTitle = Graphical Effects +qhp.QtGraphicalEffects.subprojects.qmltypes.selectors = class fake:headerfile +qhp.QtGraphicalEffects.subprojects.qmltypes.sortPages = true + +outputdir = $$QT_INSTALL_DOCS/qtgraphicaleffects tagfile = ../../../doc/qtgraphicaleffects/qtgraphicaleffects.tags headerdirs += .. \ diff --git a/src/effects/effects.pro b/src/effects/effects.pro index ba8354c..355cfff 100644 --- a/src/effects/effects.pro +++ b/src/effects/effects.pro @@ -35,4 +35,5 @@ QML_FILES = \ private/GaussianMaskedBlur.qml \ private/SourceProxy.qml +QMAKE_DOCS = $$PWD/doc/qtgraphicaleffects.qdocconf load(qml_module) |