diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebKit/qt/docs/qtwebkit.qdoc | 4 | ||||
| -rw-r--r-- | Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp | 2 | ||||
| -rw-r--r-- | Source/qtwebkit.qdocconf | 20 |
3 files changed, 22 insertions, 4 deletions
diff --git a/Source/WebKit/qt/docs/qtwebkit.qdoc b/Source/WebKit/qt/docs/qtwebkit.qdoc index f8cd8e702..384f63177 100644 --- a/Source/WebKit/qt/docs/qtwebkit.qdoc +++ b/Source/WebKit/qt/docs/qtwebkit.qdoc @@ -1,5 +1,6 @@ /*! \module QtWebKit + \page qtwebkitwidgets-index.html \title WebKit in Qt \contentspage All Qt Modules \previouspage QtSvg @@ -29,9 +30,6 @@ made fully editable to the user through the use of the \c{contenteditable} attribute on HTML elements. - QtWebKit has been enhanced to become more attractive on the mobile front as well. - For more information see \l{QtWebKit Goes Mobile}. - QtWebKit is based on the Open Source WebKit engine. More information about WebKit itself can be found on the \l{WebKit Open Source Project} Web site. diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp index e83e13379..a41bde0a7 100644 --- a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp @@ -1413,7 +1413,7 @@ QQuickWebPage* QQuickWebViewExperimental::page() } /*! - \page index.html + \page qtwebkit-index.html \title QtWebKit: QML WebView version 3.0 The WebView API allows QML applications to render regions of dynamic diff --git a/Source/qtwebkit.qdocconf b/Source/qtwebkit.qdocconf index 81626c919..be5bb54cd 100644 --- a/Source/qtwebkit.qdocconf +++ b/Source/qtwebkit.qdocconf @@ -5,6 +5,26 @@ project = qtwebkit description = "Qt WebKit API Documentation" version = 5.0.0 +# Defines the name of the project. You cannot use operators (+, =, -) in +# the name. Properties for this project are set using a qhp.<projectname>.property +# format. +qhp.projects = qtwebkit +qhp.qtwebkit.file = qtwebkit.qhp +qhp.qtwebkit.namespace = org.qt-project.qtwebkit.500 +qhp.qtwebkit.indexTitle = Qt WebKit Reference Documentation +qhp.qtwebkit.virtualFolder = qtwebkit + +# For listing child nodes in Qt Creator or Assistant. +qhp.qtwebkit.subprojects = classes qmltypes +qhp.qtwebkit.subprojects.classes.title = C++ Classes +qhp.qtwebkit.subprojects.classes.indexTitle = Qt WebKit C++ Classes +qhp.qtwebkit.subprojects.classes.selectors = class fake:headerfile +qhp.qtwebkit.subprojects.classes.sortPages = true +qhp.qtwebkit.subprojects.qmltypes.title = QML Types +qhp.qtwebkit.subprojects.qmltypes.indexTitle = Qt WebKit QML Types +qhp.qtwebkit.subprojects.qmltypes.selectors = class fake:headerfile +qhp.qtwebkit.subprojects.qmltypes.sortPages = true + headerdirs = WebKit/qt/Api WebKit/qt/WidgetApi WebKit2/UIProcess/API/qt sourcedirs = WebKit/qt/Api WebKit/qt/WidgetApi WebKit/qt/docs Source/JavaScriptCore/qt/api WebKit2/UIProcess/API/qt exampledirs = WebKit/qt/docs |