diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-03 14:20:01 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-04 11:12:05 +0100 |
| commit | ca2f44680cb97e7a7c46ee0ab26654822fe65e2d (patch) | |
| tree | b9d85ad8ec1b18a6aa56b7657812cf3791bdf72e /src/gui/doc/qtgui.qdocconf | |
| parent | 28a21d98ef8d880a6dd86ee19dd803424bb5eae1 (diff) | |
| parent | 83188c6499ccdc87c0a2c468bb497e287f5db369 (diff) | |
Merge branch 'stable' into dev
Conflicts:
examples/widgets/painting/shared/shared.pri
src/corelib/tools/qharfbuzz_p.h
src/corelib/tools/qunicodetools.cpp
src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp
src/plugins/platforms/windows/qwindowsfontdatabase.cpp
Change-Id: Ibc9860abf570e5ce8b052fb88feb73ec35e64bd3
Diffstat (limited to 'src/gui/doc/qtgui.qdocconf')
| -rw-r--r-- | src/gui/doc/qtgui.qdocconf | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/gui/doc/qtgui.qdocconf b/src/gui/doc/qtgui.qdocconf index cf324ad8ac..a46aa9b3d1 100644 --- a/src/gui/doc/qtgui.qdocconf +++ b/src/gui/doc/qtgui.qdocconf @@ -3,25 +3,25 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtGui description = Qt GUI Reference Documentation url = http://qt-project.org/doc/qtgui -version = 5.0.0 +version = 5.0.1 examplesinstallpath = gui qhp.projects = QtGui qhp.QtGui.file = qtgui.qhp -qhp.QtGui.namespace = org.qt-project.qtgui.500 +qhp.QtGui.namespace = org.qt-project.qtgui.501 qhp.QtGui.virtualFolder = qtgui qhp.QtGui.indexTitle = Qt GUI qhp.QtGui.indexRoot = -qhp.QtGui.filterAttributes = qtgui 5.0.0 qtrefdoc -qhp.QtGui.customFilters.Qt.name = Qtgui 5.0.0 -qhp.QtGui.customFilters.Qt.filterAttributes = qtgui 5.0.0 +qhp.QtGui.filterAttributes = qtgui 5.0.1 qtrefdoc +qhp.QtGui.customFilters.Qt.name = Qtgui 5.0.1 +qhp.QtGui.customFilters.Qt.filterAttributes = qtgui 5.0.1 qhp.QtGui.subprojects = classes qhp.QtGui.subprojects.classes.title = C++ Classes -qhp.QtGui.subprojects.classes.indexTitle = Qt GUI C++ Classes +qhp.QtGui.subprojects.classes.indexTitle = Qt GUI C++ API qhp.QtGui.subprojects.classes.selectors = class fake:headerfile qhp.QtGui.subprojects.classes.sortPages = true @@ -40,9 +40,10 @@ depends += \ headerdirs += .. sourcedirs += .. \ - ../../../examples/gui/doc + ../../../examples/gui/doc/src exampledirs += ../../../examples/gui \ snippets -imagedirs += images +imagedirs += images \ + ../../../examples/gui/doc/images |