diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-12 11:32:02 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-12 11:35:45 +0100 |
| commit | a077399f4c17f57e911334867c918cc6ddeb15fc (patch) | |
| tree | c8e4d326d7a074e9d16b68399ecc5f728f8533fe /src/webengine/api/qquickwebenginehistory.cpp | |
| parent | 3d698f5de377bde2293e222536bc50171cfdf1b8 (diff) | |
| parent | 12dd6ff845656eb625e2ee3d0e73392bc2c61983 (diff) | |
| download | qtwebengine-a077399f4c17f57e911334867c918cc6ddeb15fc.tar.gz | |
Merge branch '5.6' into dev
Change-Id: I4272eb59cac08c69eaa58dd4d94debf1b8c5cf78
Diffstat (limited to 'src/webengine/api/qquickwebenginehistory.cpp')
| -rw-r--r-- | src/webengine/api/qquickwebenginehistory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/webengine/api/qquickwebenginehistory.cpp b/src/webengine/api/qquickwebenginehistory.cpp index 175b52248..d790093a4 100644 --- a/src/webengine/api/qquickwebenginehistory.cpp +++ b/src/webengine/api/qquickwebenginehistory.cpp @@ -121,7 +121,7 @@ int QQuickWebEngineForwardHistoryListModelPrivate::offsetForIndex(int index) con /*! \qmltype WebEngineHistoryListModel \instantiates QQuickWebEngineHistoryListModel - \inqmlmodule QtWebEngine 1.1 + \inqmlmodule QtWebEngine \since QtWebEngine 1.1 \brief A data model that represents the history of a web engine page. @@ -208,7 +208,7 @@ QQuickWebEngineHistoryPrivate::~QQuickWebEngineHistoryPrivate() /*! \qmltype WebEngineHistory \instantiates QQuickWebEngineHistory - \inqmlmodule QtWebEngine 1.1 + \inqmlmodule QtWebEngine \since QtWebEngine 1.1 \brief Provides data models that represent the history of a web engine page. |