diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-28 08:52:53 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-04-28 08:52:53 +0000 |
| commit | 59ba09bdb191888ea21aafcf90e576bfb3e7406c (patch) | |
| tree | dc9b44c1ed5a3d27d5bd6942c4fdb3cc7dc8a276 /src/webengine/api/qquickwebenginehistory.cpp | |
| parent | 0cf94ce10d5559ac99b1893abca6ad6bc407528c (diff) | |
| parent | 658a964cf2593e6da3b1a822124e796bbe354d36 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/webengine/api/qquickwebenginehistory.cpp')
| -rw-r--r-- | src/webengine/api/qquickwebenginehistory.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/webengine/api/qquickwebenginehistory.cpp b/src/webengine/api/qquickwebenginehistory.cpp index 5589f9b53..970bfb22d 100644 --- a/src/webengine/api/qquickwebenginehistory.cpp +++ b/src/webengine/api/qquickwebenginehistory.cpp @@ -233,7 +233,7 @@ QQuickWebEngineHistoryPrivate::~QQuickWebEngineHistoryPrivate() The WebEngineHistory type can be accessed by using the \l{WebEngineView::navigationHistory}{WebEngineView.navigationHistory} property. - The WebEngineHistory type providess the following WebEngineHistoryListModel data model objects: + The WebEngineHistory type provides the following WebEngineHistoryListModel data model objects: \list \li \c backItems, which contains the URLs of visited pages. @@ -294,9 +294,8 @@ QQuickWebEngineHistory::~QQuickWebEngineHistory() } /*! - \qmlproperty QQuickWebEngineHistoryListModel WebEngineHistory::items + \qmlproperty WebEngineHistoryListModel WebEngineHistory::items \readonly - \since QtWebEngine 1.1 URLs of back items, forward items, and the current item in the history. */ @@ -309,9 +308,8 @@ QQuickWebEngineHistoryListModel *QQuickWebEngineHistory::items() const } /*! - \qmlproperty QQuickWebEngineHistoryListModel WebEngineHistory::backItems + \qmlproperty WebEngineHistoryListModel WebEngineHistory::backItems \readonly - \since QtWebEngine 1.1 URLs of visited pages. */ @@ -324,9 +322,8 @@ QQuickWebEngineHistoryListModel *QQuickWebEngineHistory::backItems() const } /*! - \qmlproperty QQuickWebEngineHistoryListModel WebEngineHistory::forwardItems + \qmlproperty WebEngineHistoryListModel WebEngineHistory::forwardItems \readonly - \since QtWebEngine 1.1 URLs of the pages that were visited after visiting the current page. */ |