summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2016-09-19 15:18:03 +0200
committerKai Koehne <kai.koehne@qt.io>2016-09-20 06:43:31 +0000
commit0e5553a1626cb707499d82c96e136ceb79dfb54d (patch)
treec7a75d1760e81864204ed281491c3a47bb8eb9e2
parent099ffa623920355f3a70402ddfa49dd1a3ecb2f0 (diff)
Doc: Fix types of \qmlproperty
Change-Id: Ibb470580404f2b09dc8c7c2de275ade97251d612 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
-rw-r--r--src/webengine/api/qquickwebenginecontextmenudata.cpp10
-rw-r--r--src/webengine/api/qquickwebenginescript.cpp2
-rw-r--r--src/webengine/doc/src/webengineview.qdoc6
3 files changed, 9 insertions, 9 deletions
diff --git a/src/webengine/api/qquickwebenginecontextmenudata.cpp b/src/webengine/api/qquickwebenginecontextmenudata.cpp
index 8f02b220a..2cc6eaf4b 100644
--- a/src/webengine/api/qquickwebenginecontextmenudata.cpp
+++ b/src/webengine/api/qquickwebenginecontextmenudata.cpp
@@ -84,7 +84,7 @@ bool QQuickWebEngineContextMenuData::isValid() const
}
/*!
- \qmlproperty QPoint WebEngineContextMenuData::position
+ \qmlproperty point WebEngineContextMenuData::position
Returns the position of the context, usually the mouse position where the context menu event was triggered.
@@ -95,7 +95,7 @@ QPoint QQuickWebEngineContextMenuData::position() const
}
/*!
- \qmlproperty QString WebEngineContextMenuData::linkText
+ \qmlproperty string WebEngineContextMenuData::linkText
Returns the text of a link if the context is a link.
*/
@@ -105,7 +105,7 @@ QString QQuickWebEngineContextMenuData::linkText() const
}
/*!
- \qmlproperty QUrl WebEngineContextMenuData::linkUrl
+ \qmlproperty url WebEngineContextMenuData::linkUrl
Returns the URL of a link if the context is a link.
*/
@@ -115,7 +115,7 @@ QUrl QQuickWebEngineContextMenuData::linkUrl() const
}
/*!
- \qmlproperty QString WebEngineContextMenuData::selectedText
+ \qmlproperty string WebEngineContextMenuData::selectedText
Returns the selected text of the context.
*/
@@ -125,7 +125,7 @@ QString QQuickWebEngineContextMenuData::selectedText() const
}
/*!
- \qmlproperty QUrl WebEngineContextMenuData::mediaUrl
+ \qmlproperty url WebEngineContextMenuData::mediaUrl
If the context is a media element, returns the URL of that media.
*/
diff --git a/src/webengine/api/qquickwebenginescript.cpp b/src/webengine/api/qquickwebenginescript.cpp
index a1c903df3..7e08e2fd5 100644
--- a/src/webengine/api/qquickwebenginescript.cpp
+++ b/src/webengine/api/qquickwebenginescript.cpp
@@ -105,7 +105,7 @@ QString QQuickWebEngineScript::toString() const
}
/*!
- \qmlproperty QString WebEngineScript::name
+ \qmlproperty string WebEngineScript::name
The name of the script. Can be useful to retrieve a particular script from
\l{WebEngineView::userScripts}{WebEngineView.userScripts}.
diff --git a/src/webengine/doc/src/webengineview.qdoc b/src/webengine/doc/src/webengineview.qdoc
index 8d0e64416..b72e405a8 100644
--- a/src/webengine/doc/src/webengineview.qdoc
+++ b/src/webengine/doc/src/webengineview.qdoc
@@ -342,21 +342,21 @@
*/
/*!
- \qmlproperty QSizeF WebEngineView::contentsSize
+ \qmlproperty size WebEngineView::contentsSize
\since QtWebEngine 1.3
Size of the page contents.
*/
/*!
- \qmlproperty QPointF WebEngineView::scrollPosition
+ \qmlproperty point WebEngineView::scrollPosition
\since QtWebEngine 1.3
Scroll position of the page contents.
*/
/*!
- \qmlproperty uint WebEngineView::webChannelWorld
+ \qmlproperty int WebEngineView::webChannelWorld
\since QtWebEngine 1.3
JavaScript world that the web channel instance used by this view is