summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVenugopal Shivashankar <venugopal.shivashankar@digia.com>2015-07-17 12:27:28 +0200
committerVenugopal Shivashankar <venugopal.shivashankar@digia.com>2015-07-20 08:18:07 +0000
commit4a56c235e1bd12071e58d36113fccb270ee98a5e (patch)
tree44ca105215ea9d32597f06faa9fb5191b60f541c /src
parent780d4d5f6199112fa17f7f7d165a4bbc058c269e (diff)
Doc: Added \qtvariable to enable QDoc include QT += info.
Also added \since info. for some of the classes. Task-number: QTBUG-47274 Change-Id: Id8cfbd6d0e5b5826ceaebb008a453cd1c216a921 Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/webenginewidgets/api/qwebenginecertificateerror.cpp2
-rw-r--r--src/webenginewidgets/doc/src/qtwebenginewidgets.qdoc1
-rw-r--r--src/webenginewidgets/doc/src/qwebenginehistory_lgpl.qdoc4
-rw-r--r--src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc2
-rw-r--r--src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc2
-rw-r--r--src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc1
6 files changed, 7 insertions, 5 deletions
diff --git a/src/webenginewidgets/api/qwebenginecertificateerror.cpp b/src/webenginewidgets/api/qwebenginecertificateerror.cpp
index 3535b3a9c..e320552bf 100644
--- a/src/webenginewidgets/api/qwebenginecertificateerror.cpp
+++ b/src/webenginewidgets/api/qwebenginecertificateerror.cpp
@@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE
/*!
\class QWebEngineCertificateError
\brief The QWebEngineCertificateError class provides information about a certificate error.
-
+ \since 5.4
\inmodule QtWebEngineWidgets
QWebEngineCertificateError holds known information about a certificate error to be used to determine whether to allow it or not, and to be reported to the user.
diff --git a/src/webenginewidgets/doc/src/qtwebenginewidgets.qdoc b/src/webenginewidgets/doc/src/qtwebenginewidgets.qdoc
index 4642cc4d7..1e8cda065 100644
--- a/src/webenginewidgets/doc/src/qtwebenginewidgets.qdoc
+++ b/src/webenginewidgets/doc/src/qtwebenginewidgets.qdoc
@@ -28,6 +28,7 @@
/*!
\module QtWebEngineWidgets
\title Qt WebEngine Widgets C++ Classes
+ \qtvariable webenginewidgets
\brief Provides a web browser engine as well as C++ classes to render and
interact with web content
diff --git a/src/webenginewidgets/doc/src/qwebenginehistory_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginehistory_lgpl.qdoc
index 08690e504..2674890de 100644
--- a/src/webenginewidgets/doc/src/qwebenginehistory_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebenginehistory_lgpl.qdoc
@@ -25,7 +25,7 @@
/*!
\class QWebEngineHistoryItem
\brief The QWebEngineHistoryItem class represents one item in the history of a QWebEnginePage
-
+ \since 5.4
\inmodule QtWebEngineWidgets
Each QWebEngineHistoryItem instance represents an entry in the history stack of a Web page,
@@ -100,7 +100,7 @@
/*!
\class QWebEngineHistory
\brief The QWebEngineHistory class represents the history of a QWebEnginePage
-
+ \since 5.4
\inmodule QtWebEngineWidgets
Each QWebEnginePage instance contains a history of visited pages that can be accessed
diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
index 3088a66b6..080f4796a 100644
--- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
@@ -27,7 +27,7 @@
/*!
\class QWebEnginePage
\brief The QWebEnginePage class provides an object to view and edit web documents.
-
+ \since 5.4
\inmodule QtWebEngineWidgets
QWebEnginePage holds a main frame responsible for web content, the history
diff --git a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc
index 82410a50f..521c08781 100644
--- a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc
@@ -32,7 +32,7 @@
/*!
\class QWebEngineSettings
- \since QtWebEngine 1.0
+ \since 5.4
\brief The QWebEngineSettings class provides an object to store the settings used
by QWebEnginePage
diff --git a/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc
index d1b390580..4f9a4b4be 100644
--- a/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc
@@ -28,6 +28,7 @@
\class QWebEngineView
\brief The QWebEngineView class provides a widget that is used to view and edit
web documents.
+ \since 5.4
\ingroup advanced
\inmodule QtWebEngineWidgets