diff options
| author | Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> | 2015-10-06 17:07:08 +0200 |
|---|---|---|
| committer | Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> | 2015-10-07 08:06:57 +0000 |
| commit | 8318548b32134203a6a74029312da5cdff484a35 (patch) | |
| tree | ddd6e1224dacb4c9902f740876e5decfc45d624f /src/webenginewidgets | |
| parent | dfebd43f600e4ffd16975a0c5d401740e45fee54 (diff) | |
Doc: remove doc config file from Qt WebEngineWidgets submodule
This helps maintaining the doc dependencies.
All Qt WebEngine module docs are now generated in the
/qtbase/doc/qtwebengine/ folder.
Note that you must run qmake -r for the docs to be generated
correctly after applying this patch.
Add Qt WebEngine C++ Classes page that lists the C++ classes
for the submodules.
Modify snippet and example paths accordingly.
Change-Id: I59431c5f766f30b59654ca4e2219b76c79137225
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Diffstat (limited to 'src/webenginewidgets')
| -rw-r--r-- | src/webenginewidgets/doc/qtwebenginewidgets.qdocconf | 43 | ||||
| -rw-r--r-- | src/webenginewidgets/doc/src/qtwebenginewidgets-module.qdoc | 5 | ||||
| -rw-r--r-- | src/webenginewidgets/webenginewidgets.pro | 2 |
3 files changed, 5 insertions, 45 deletions
diff --git a/src/webenginewidgets/doc/qtwebenginewidgets.qdocconf b/src/webenginewidgets/doc/qtwebenginewidgets.qdocconf deleted file mode 100644 index 7b48b7a14..000000000 --- a/src/webenginewidgets/doc/qtwebenginewidgets.qdocconf +++ /dev/null @@ -1,43 +0,0 @@ -include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) - -project = QtWebEngineWidgets -description = Qt WebEngineWidgets Reference Documentation -version = $QT_VERSION - -examplesinstallpath = webenginewidgets - -qhp.projects = QtWebEngineWidgets - -qhp.QtWebEngineWidgets.file = qtwebenginewidgets.qhp -qhp.QtWebEngineWidgets.namespace = org.qt-project.qtwebenginewidgets.$QT_VERSION_TAG -qhp.QtWebEngineWidgets.virtualFolder = qtwebenginewidgets -qhp.QtWebEngineWidgets.indexTitle = Qt WebEngine Widgets -qhp.QtWebEngineWidgets.indexRoot = - -qhp.QtWebEngineWidgets.filterAttributes = qtwebenginewidgets $QT_VERSION qtrefdoc -qhp.QtWebEngineWidgets.customFilters.Qt.name = QtWebEngineWidgets $QT_VERSION -qhp.QtWebEngineWidgets.customFilters.Qt.filterAttributes = qtwebenginewidgets $QT_VERSION -qhp.QtWebEngineWidgets.subprojects = classes examples -qhp.QtWebEngineWidgets.subprojects.classes.title = C++ Classes -qhp.QtWebEngineWidgets.subprojects.classes.indexTitle = Qt WebEngine Widgets C++ Classes -qhp.QtWebEngineWidgets.subprojects.classes.selectors = class fake:headerfile -qhp.QtWebEngineWidgets.subprojects.classes.sortPages = true -qhp.QtWebEngineWidgets.subprojects.examples.title = Examples -qhp.QtWebEngineWidgets.subprojects.examples.indexTitle = Qt WebEngine Widgets Examples -qhp.QtWebEngineWidgets.subprojects.examples.selectors = fake:example -qhp.QtWebEngineWidgets.subprojects.examples.sortPages = true - -tagfile = ../../../doc/qtwebenginewidgets/qtwebenginewidgets.tags - -depends += qtwebengine qtcore qtnetwork qtgui qtwidgets qtwebkit qtdoc qtwebchannel - -headerdirs += ../api -sourcedirs += ../api src - -exampledirs += ../../../examples/webenginewidgets \ - snippets - -navigation.landingpage = "Qt WebEngine Widgets" -navigation.cppclassespage = "Qt WebEngine Widgets C++ Classes" - -Cpp.ignoretokens += QWEBENGINEWIDGETS_EXPORT diff --git a/src/webenginewidgets/doc/src/qtwebenginewidgets-module.qdoc b/src/webenginewidgets/doc/src/qtwebenginewidgets-module.qdoc index 6373389f3..a9ef6ad8c 100644 --- a/src/webenginewidgets/doc/src/qtwebenginewidgets-module.qdoc +++ b/src/webenginewidgets/doc/src/qtwebenginewidgets-module.qdoc @@ -30,7 +30,12 @@ \title Qt WebEngine Widgets C++ Classes \brief Provides a web browser engine as well as C++ classes to render and interact with web content + \ingroup modules \ingroup qtwebengine-modules + \qtvariable webenginewidgets + + The Qt WebEngineWidgets module provides a web browser engine as well as C++ classes to render + and interact with web content. To include the definitions of the module's classes, use the following directive: diff --git a/src/webenginewidgets/webenginewidgets.pro b/src/webenginewidgets/webenginewidgets.pro index c32185563..17a0a3dbb 100644 --- a/src/webenginewidgets/webenginewidgets.pro +++ b/src/webenginewidgets/webenginewidgets.pro @@ -6,8 +6,6 @@ DEFINES += QT_BUILD_WEBENGINEWIDGETS_LIB QT += webengine webenginecore widgets network quick QT_PRIVATE += quick-private gui-private core-private -QMAKE_DOCS = $$PWD/doc/qtwebenginewidgets.qdocconf - INCLUDEPATH += $$PWD api ../core ../core/api ../webengine/api SOURCES = \ |