From 89315f81abf11c9f5096d63b2bce2200ab45a9e7 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@theqtcompany.com>
Date: Mon, 30 Nov 2015 14:49:28 +0100
Subject: [PATCH] Remove explicit version \inqmlmodule
Also bump version in \qmlmodule QtWebEngine 1.2
Change-Id: I4d0379a3a46548e626508a8cf1fad51f742c8ddb
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
---
src/webengine/api/qquickwebenginecertificateerror.cpp | 2 +-
src/webengine/api/qquickwebenginedownloaditem.cpp | 2 +-
src/webengine/api/qquickwebenginehistory.cpp | 4 ++--
src/webengine/api/qquickwebengineloadrequest.cpp | 2 +-
src/webengine/api/qquickwebenginenewviewrequest.cpp | 2 +-
src/webengine/api/qquickwebengineprofile.cpp | 2 +-
src/webengine/api/qquickwebenginesingleton.cpp | 2 +-
src/webengine/doc/src/qtwebengine-qmlmodule.qdoc | 2 +-
src/webengine/doc/src/webengineview.qdoc | 4 ++--
9 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/webengine/api/qquickwebenginecertificateerror.cpp b/src/webengine/api/qquickwebenginecertificateerror.cpp
index f17d4a6d7..ea9b2bc11 100644
--- a/src/webengine/api/qquickwebenginecertificateerror.cpp
+++ b/src/webengine/api/qquickwebenginecertificateerror.cpp
@@ -61,7 +61,7 @@ public:
/*!
\qmltype WebEngineCertificateError
\instantiates QQuickWebEngineCertificateError
- \inqmlmodule QtWebEngine 1.1
+ \inqmlmodule QtWebEngine
\since QtWebEngine 1.1
\brief A utility type for ignoring certificate errors or rejecting erroneous certificates.
diff --git a/src/webengine/api/qquickwebenginedownloaditem.cpp b/src/webengine/api/qquickwebenginedownloaditem.cpp
index 7290dba2b..cc1a50db6 100644
--- a/src/webengine/api/qquickwebenginedownloaditem.cpp
+++ b/src/webengine/api/qquickwebenginedownloaditem.cpp
@@ -76,7 +76,7 @@ QQuickWebEngineDownloadItemPrivate::~QQuickWebEngineDownloadItemPrivate()
/*!
\qmltype WebEngineDownloadItem
\instantiates QQuickWebEngineDownloadItem
- \inqmlmodule QtWebEngine 1.1
+ \inqmlmodule QtWebEngine
\since QtWebEngine 1.1
\brief Provides information about a download.
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.
diff --git a/src/webengine/api/qquickwebengineloadrequest.cpp b/src/webengine/api/qquickwebengineloadrequest.cpp
index e94fa7eb9..e39d7b4d1 100644
--- a/src/webengine/api/qquickwebengineloadrequest.cpp
+++ b/src/webengine/api/qquickwebengineloadrequest.cpp
@@ -59,7 +59,7 @@ public:
/*!
\qmltype WebEngineLoadRequest
\instantiates QQuickWebEngineLoadRequest
- \inqmlmodule QtWebEngine 1.0
+ \inqmlmodule QtWebEngine
\since QtWebEngine 1.0
\brief A utility type for the WebEngineView::loadingChanged signal.
diff --git a/src/webengine/api/qquickwebenginenewviewrequest.cpp b/src/webengine/api/qquickwebenginenewviewrequest.cpp
index 6e20c0a46..74729ddf1 100644
--- a/src/webengine/api/qquickwebenginenewviewrequest.cpp
+++ b/src/webengine/api/qquickwebenginenewviewrequest.cpp
@@ -42,7 +42,7 @@
/*!
\qmltype WebEngineNewViewRequest
\instantiates QQuickWebEngineNewViewRequest
- \inqmlmodule QtWebEngine 1.1
+ \inqmlmodule QtWebEngine
\since QtWebEngine 1.1
\brief A utility type for the WebEngineView::newViewRequested signal.
diff --git a/src/webengine/api/qquickwebengineprofile.cpp b/src/webengine/api/qquickwebengineprofile.cpp
index a8f61dfcd..4871957c2 100644
--- a/src/webengine/api/qquickwebengineprofile.cpp
+++ b/src/webengine/api/qquickwebengineprofile.cpp
@@ -134,7 +134,7 @@ void QQuickWebEngineProfilePrivate::downloadUpdated(const DownloadItemInfo &info
/*!
\qmltype WebEngineProfile
\instantiates QQuickWebEngineProfile
- \inqmlmodule QtWebEngine 1.1
+ \inqmlmodule QtWebEngine
\since QtWebEngine 1.1
\brief Contains settings, scripts, and visited links common to multiple web engine views.
diff --git a/src/webengine/api/qquickwebenginesingleton.cpp b/src/webengine/api/qquickwebenginesingleton.cpp
index 7ff974eb4..ba4d47016 100644
--- a/src/webengine/api/qquickwebenginesingleton.cpp
+++ b/src/webengine/api/qquickwebenginesingleton.cpp
@@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE
/*!
\qmltype WebEngine
\instantiates QQuickWebEngineSingleton
- \inqmlmodule QtWebEngine 1.1
+ \inqmlmodule QtWebEngine
\since QtWebEngine 1.1
\brief Provides access to the default settings and profiles shared by all web engine views.
diff --git a/src/webengine/doc/src/qtwebengine-qmlmodule.qdoc b/src/webengine/doc/src/qtwebengine-qmlmodule.qdoc
index 89ff6f0b3..7fcddb373 100644
--- a/src/webengine/doc/src/qtwebengine-qmlmodule.qdoc
+++ b/src/webengine/doc/src/qtwebengine-qmlmodule.qdoc
@@ -24,7 +24,7 @@
*/
/*!
- \qmlmodule QtWebEngine 1.1
+ \qmlmodule QtWebEngine 1.2
\title Qt WebEngine QML Types
\brief Provides QML types for rendering web content within a QML application
\ingroup qtwebengine-qmlmodules
diff --git a/src/webengine/doc/src/webengineview.qdoc b/src/webengine/doc/src/webengineview.qdoc
index d1b4e722b..bfdeab984 100644
--- a/src/webengine/doc/src/webengineview.qdoc
+++ b/src/webengine/doc/src/webengineview.qdoc
@@ -26,7 +26,7 @@
/*!
\qmltype WebEngineView
\instantiates QQuickWebEngineView
- \inqmlmodule QtWebEngine 1.1
+ \inqmlmodule QtWebEngine
\since QtWebEngine 1.0
\brief A WebEngineView renders web content within a QML application.
*/
@@ -696,7 +696,7 @@
/*!
\qmltype WebEngineFullScreenRequest
\instantiates QQuickWebEngineFullScreenRequest
- \inqmlmodule QtWebEngine 1.1
+ \inqmlmodule QtWebEngine
\since QtWebEngine 1.1
\brief A utility type for the WebEngineView::fullScreenRequested() signal.
--
GitLab