diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2012-11-20 10:08:29 +0100 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2012-11-20 10:12:44 +0100 |
| commit | 0dc61c4216697a2c4066d4735b4be941e869e514 (patch) | |
| tree | 8a3876897fc5144cc2f9b28223ff9548944a8775 /src/network | |
| parent | b98b11fa036ea301d1483df6f533ec55be727d9d (diff) | |
| parent | a769a212e0c22283fc05d3f49c252f8e2a62ba3f (diff) | |
Merge branch 'newdocs'
Added prepare_docs to qt_build_config.prf (it was added
directly in configure in the source branch)
Conflicts:
configure
tools/configure/configureapp.cpp
Change-Id: I1337c69fc62b1c934e3e39b4409e4857440c9db8
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/doc/qtnetwork.qdocconf | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/src/network/doc/qtnetwork.qdocconf b/src/network/doc/qtnetwork.qdocconf index 24298c1efd..d15927bced 100644 --- a/src/network/doc/qtnetwork.qdocconf +++ b/src/network/doc/qtnetwork.qdocconf @@ -1,37 +1,31 @@ -include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf) include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtNetwork description = Qt Network Reference Documentation -url = http://qt-project.org/doc/qt-5.0/qtnetwork +url = http://qt-project.org/doc/qtnetwork version = 5.0.0 qhp.projects = QtNetwork qhp.QtNetwork.file = qtnetwork.qhp qhp.QtNetwork.namespace = org.qt-project.qtnetwork.500 -qhp.QtNetwork.virtualFolder = qdoc -qhp.QtNetwork.indexTitle = Qt Network Reference Documentation +qhp.QtNetwork.virtualFolder = qtnetwork +qhp.QtNetwork.indexTitle = Qt Network qhp.QtNetwork.indexRoot = qhp.QtNetwork.filterAttributes = qtnetwork 5.0.0 qtrefdoc qhp.QtNetwork.customFilters.Qt.name = QtNetwork 5.0.0 qhp.QtNetwork.customFilters.Qt.filterAttributes = qtnetwork 5.0.0 -qhp.QtNetwork.subprojects = classes overviews examples -qhp.QtNetwork.subprojects.classes.title = Classes -qhp.QtNetwork.subprojects.classes.indexTitle = Qt Network's Classes + +qhp.QtNetwork.subprojects = classes +qhp.QtNetwork.subprojects.classes.title = C++ Classes +qhp.QtNetwork.subprojects.classes.indexTitle = Qt Network C++ Classes qhp.QtNetwork.subprojects.classes.selectors = class fake:headerfile qhp.QtNetwork.subprojects.classes.sortPages = true -qhp.QtNetwork.subprojects.overviews.title = Overviews -qhp.QtNetwork.subprojects.overviews.indexTitle = All Overviews and HOWTOs -qhp.QtNetwork.subprojects.overviews.selectors = fake:page,group,module -qhp.QtNetwork.subprojects.examples.title = Qt Network Examples -qhp.QtNetwork.subprojects.examples.indexTitle = Qt Network Examples -qhp.QtNetwork.subprojects.examples.selectors = fake:example tagfile = ../../../doc/qtnetwork/qtnetwork.tags -depends += qtcore +depends += qtcore qtgui qtdoc headerdirs += .. |