From 5e0639fae81dc18c9b094883134c25ddd74c93a9 Mon Sep 17 00:00:00 2001 From: Kavindra Palaraja Date: Wed, 24 Jun 2015 20:52:21 +0200 Subject: Cleaned up the module overview. Polished the brief and some sentences in the module overview to improve readability. Change-Id: I35964880214ecd61859094b0ea7e318ff3e53fa6 Reviewed-by: Kai Koehne --- .../doc/src/qtwebenginewidgets.qdoc | 45 ++++++---------------- 1 file changed, 12 insertions(+), 33 deletions(-) (limited to 'src/webenginewidgets') diff --git a/src/webenginewidgets/doc/src/qtwebenginewidgets.qdoc b/src/webenginewidgets/doc/src/qtwebenginewidgets.qdoc index ed1f1a773..4642cc4d7 100644 --- a/src/webenginewidgets/doc/src/qtwebenginewidgets.qdoc +++ b/src/webenginewidgets/doc/src/qtwebenginewidgets.qdoc @@ -47,43 +47,22 @@ \title Qt WebEngine Widgets \ingroup modules - \brief The Qt WebEngine Widgets module provides a web browser engine as well as - C++ classes to render and interact with web content. + \brief The Qt WebEngine Widgets module provides a web browser engine as + well as C++ classes to display and interact with web content. - Qt WebEngine Widgets provides a Web browser engine that makes it easy to embed - content from the World Wide Web into your Qt application. + Qt WebEngine Widgets gives you a Web browser engine that you can use to + embed content easily from the World Wide Web into your Qt application. - Qt WebEngine Widgets provides facilities for rendering of HyperText Markup - Language version 5 (HTML5), Extensible HyperText Markup Language (XHTML) and Scalable - Vector Graphics (SVG) documents, styled using Cascading Style Sheets (CSS) - and scripted with JavaScript. + Qt WebEngine Widgets lets you display HyperText Markup Language version 5 + (HTML5), Extensible HyperText Markup Language (XHTML) and Scalable Vector + Graphics (SVG) documents, styled using Cascading Style Sheets (CSS) and + scripted with JavaScript. - In addition to providing pure rendering features, HTML documents can be - made fully editable to the user through the use of the \c{contenteditable} - attribute on HTML elements. + HTML and XHTML documents can also be made fully editable to the user by + using the \c{contenteditable} attribute on HTML elements. - Qt WebEngine is based on the Chromium project. More information about - Chromium itself can be found on the \l{http://www.chromium.org} - {Chromium Project} Web site. - - \section1 Should I use Qt WebEngine or Qt WebKit? - - Qt WebEngine supercedes the \l{Qt WebKit Widgets}{Qt WebKit} module, which - was based on the WebKit project, but isn't actively synchronized with the - upstream WebKit code since Qt 5.2. - - Chromium provides its own network and painting engines and is developed - tightly together with its dependent modules, thus Qt WebEngine provides - better and more reliable support for the latest HTML5 specification. - For this reason Qt WebEngine is however heavier than Qt WebKit and doesn't - give direct access to the network stack and the HTML document through C++ APIs. - - For new code we suggest using Qt WebEngine, but it makes sense to continue - using Qt WebKit for applications that are in need of a deeper C++ API than - having better and up-to-date support for HTML, CSS and JavaScript features. - - For tips on how to change a Qt WebKit application to use Qt WebEngine, see - \l{Porting from Qt WebKit to Qt WebEngine} + Qt WebEngine is based on the Chromium project. See the + \l{http://www.chromium.org}{Chromium Project} Web site for more information. \section1 Including In Your Project -- cgit v1.2.3 From 4a56c235e1bd12071e58d36113fccb270ee98a5e Mon Sep 17 00:00:00 2001 From: Venugopal Shivashankar Date: Fri, 17 Jul 2015 12:27:28 +0200 Subject: Doc: Added \qtvariable to enable QDoc include QT += info. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also added \since info. for some of the classes. Task-number: QTBUG-47274 Change-Id: Id8cfbd6d0e5b5826ceaebb008a453cd1c216a921 Reviewed-by: Topi Reiniö --- src/webenginewidgets/api/qwebenginecertificateerror.cpp | 2 +- src/webenginewidgets/doc/src/qtwebenginewidgets.qdoc | 1 + src/webenginewidgets/doc/src/qwebenginehistory_lgpl.qdoc | 4 ++-- src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc | 2 +- src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc | 2 +- src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc | 1 + 6 files changed, 7 insertions(+), 5 deletions(-) (limited to 'src/webenginewidgets') 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 -- cgit v1.2.3 From 46b9507f023d416752f7f8ab4d01cf131e002617 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 23 Jul 2015 16:58:04 +0200 Subject: Unify Copyright headers Change-Id: I4cc145311cb41576d6f166ad4ddc085eeccc1650 Reviewed-by: Joerg Bornemann --- src/webenginewidgets/api/qwebengineurlrequestjob.cpp | 10 +++++----- src/webenginewidgets/api/qwebengineurlrequestjob_p.h | 10 +++++----- src/webenginewidgets/api/qwebengineurlschemehandler.cpp | 10 +++++----- src/webenginewidgets/api/qwebengineurlschemehandler_p.h | 10 +++++----- src/webenginewidgets/api/qwebengineurlschemehandler_p_p.h | 10 +++++----- src/webenginewidgets/ui/messagebubblewidget.cpp | 14 +++++++------- src/webenginewidgets/ui/messagebubblewidget_p.h | 14 +++++++------- 7 files changed, 39 insertions(+), 39 deletions(-) (limited to 'src/webenginewidgets') diff --git a/src/webenginewidgets/api/qwebengineurlrequestjob.cpp b/src/webenginewidgets/api/qwebengineurlrequestjob.cpp index 4a813236c..2bff57236 100644 --- a/src/webenginewidgets/api/qwebengineurlrequestjob.cpp +++ b/src/webenginewidgets/api/qwebengineurlrequestjob.cpp @@ -10,15 +10,15 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser ** General Public License version 3 as published by the Free Software ** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to +** packaging of this file. Please review the following information to ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** @@ -26,7 +26,7 @@ ** Alternatively, this file may be used under the terms of the GNU ** General Public License version 2.0 or later as published by the Free ** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to +** the packaging of this file. Please review the following information to ** ensure the GNU General Public License version 2.0 requirements will be ** met: http://www.gnu.org/licenses/gpl-2.0.html. ** diff --git a/src/webenginewidgets/api/qwebengineurlrequestjob_p.h b/src/webenginewidgets/api/qwebengineurlrequestjob_p.h index e496e4051..aa39c5adc 100644 --- a/src/webenginewidgets/api/qwebengineurlrequestjob_p.h +++ b/src/webenginewidgets/api/qwebengineurlrequestjob_p.h @@ -10,15 +10,15 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser ** General Public License version 3 as published by the Free Software ** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to +** packaging of this file. Please review the following information to ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** @@ -26,7 +26,7 @@ ** Alternatively, this file may be used under the terms of the GNU ** General Public License version 2.0 or later as published by the Free ** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to +** the packaging of this file. Please review the following information to ** ensure the GNU General Public License version 2.0 requirements will be ** met: http://www.gnu.org/licenses/gpl-2.0.html. ** diff --git a/src/webenginewidgets/api/qwebengineurlschemehandler.cpp b/src/webenginewidgets/api/qwebengineurlschemehandler.cpp index 65dd8f000..a0e751c24 100644 --- a/src/webenginewidgets/api/qwebengineurlschemehandler.cpp +++ b/src/webenginewidgets/api/qwebengineurlschemehandler.cpp @@ -10,15 +10,15 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser ** General Public License version 3 as published by the Free Software ** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to +** packaging of this file. Please review the following information to ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** @@ -26,7 +26,7 @@ ** Alternatively, this file may be used under the terms of the GNU ** General Public License version 2.0 or later as published by the Free ** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to +** the packaging of this file. Please review the following information to ** ensure the GNU General Public License version 2.0 requirements will be ** met: http://www.gnu.org/licenses/gpl-2.0.html. ** diff --git a/src/webenginewidgets/api/qwebengineurlschemehandler_p.h b/src/webenginewidgets/api/qwebengineurlschemehandler_p.h index 153b78f81..b1c189bc4 100644 --- a/src/webenginewidgets/api/qwebengineurlschemehandler_p.h +++ b/src/webenginewidgets/api/qwebengineurlschemehandler_p.h @@ -10,15 +10,15 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser ** General Public License version 3 as published by the Free Software ** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to +** packaging of this file. Please review the following information to ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** @@ -26,7 +26,7 @@ ** Alternatively, this file may be used under the terms of the GNU ** General Public License version 2.0 or later as published by the Free ** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to +** the packaging of this file. Please review the following information to ** ensure the GNU General Public License version 2.0 requirements will be ** met: http://www.gnu.org/licenses/gpl-2.0.html. ** diff --git a/src/webenginewidgets/api/qwebengineurlschemehandler_p_p.h b/src/webenginewidgets/api/qwebengineurlschemehandler_p_p.h index b15171edc..8472f5319 100644 --- a/src/webenginewidgets/api/qwebengineurlschemehandler_p_p.h +++ b/src/webenginewidgets/api/qwebengineurlschemehandler_p_p.h @@ -10,15 +10,15 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser ** General Public License version 3 as published by the Free Software ** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to +** packaging of this file. Please review the following information to ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** @@ -26,7 +26,7 @@ ** Alternatively, this file may be used under the terms of the GNU ** General Public License version 2.0 or later as published by the Free ** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to +** the packaging of this file. Please review the following information to ** ensure the GNU General Public License version 2.0 requirements will be ** met: http://www.gnu.org/licenses/gpl-2.0.html. ** diff --git a/src/webenginewidgets/ui/messagebubblewidget.cpp b/src/webenginewidgets/ui/messagebubblewidget.cpp index 3465f4218..490e2a8f8 100644 --- a/src/webenginewidgets/ui/messagebubblewidget.cpp +++ b/src/webenginewidgets/ui/messagebubblewidget.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtWebEngine module of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser ** General Public License version 3 as published by the Free Software ** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to +** packaging of this file. Please review the following information to ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** @@ -26,7 +26,7 @@ ** Alternatively, this file may be used under the terms of the GNU ** General Public License version 2.0 or later as published by the Free ** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to +** the packaging of this file. Please review the following information to ** ensure the GNU General Public License version 2.0 requirements will be ** met: http://www.gnu.org/licenses/gpl-2.0.html. ** diff --git a/src/webenginewidgets/ui/messagebubblewidget_p.h b/src/webenginewidgets/ui/messagebubblewidget_p.h index 7b7a9e309..46b36149a 100644 --- a/src/webenginewidgets/ui/messagebubblewidget_p.h +++ b/src/webenginewidgets/ui/messagebubblewidget_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtWebEngine module of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser ** General Public License version 3 as published by the Free Software ** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to +** packaging of this file. Please review the following information to ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** @@ -26,7 +26,7 @@ ** Alternatively, this file may be used under the terms of the GNU ** General Public License version 2.0 or later as published by the Free ** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to +** the packaging of this file. Please review the following information to ** ensure the GNU General Public License version 2.0 requirements will be ** met: http://www.gnu.org/licenses/gpl-2.0.html. ** -- cgit v1.2.3 From 6af8a66af927677e65a5685b0fdee1e36eb93cd6 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 23 Jul 2015 16:58:29 +0200 Subject: Add private header warning Change-Id: I95ae03b34631f166d2eed68e20282eb624ff408a Reviewed-by: Joerg Bornemann --- src/webenginewidgets/api/qwebenginedownloaditem_p.h | 11 +++++++++++ src/webenginewidgets/api/qwebenginehistory_p.h | 11 +++++++++++ src/webenginewidgets/api/qwebenginepage_p.h | 11 +++++++++++ src/webenginewidgets/api/qwebengineprofile_p.h | 11 +++++++++++ src/webenginewidgets/api/qwebenginescriptcollection_p.h | 11 +++++++++++ src/webenginewidgets/api/qwebengineurlrequestjob_p.h | 11 +++++++++++ src/webenginewidgets/api/qwebengineurlschemehandler_p.h | 11 +++++++++++ src/webenginewidgets/api/qwebengineurlschemehandler_p_p.h | 11 +++++++++++ src/webenginewidgets/api/qwebengineview_p.h | 11 +++++++++++ src/webenginewidgets/ui/messagebubblewidget_p.h | 11 +++++++++++ 10 files changed, 110 insertions(+) (limited to 'src/webenginewidgets') diff --git a/src/webenginewidgets/api/qwebenginedownloaditem_p.h b/src/webenginewidgets/api/qwebenginedownloaditem_p.h index 40c7c6b49..87dc4114a 100644 --- a/src/webenginewidgets/api/qwebenginedownloaditem_p.h +++ b/src/webenginewidgets/api/qwebenginedownloaditem_p.h @@ -37,6 +37,17 @@ #ifndef QWEBENGINEDOWNLOADITEM_P_H #define QWEBENGINEDOWNLOADITEM_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qtwebenginewidgetsglobal.h" #include "qwebenginedownloaditem_p.h" diff --git a/src/webenginewidgets/api/qwebenginehistory_p.h b/src/webenginewidgets/api/qwebenginehistory_p.h index a3c773c5e..e45023177 100644 --- a/src/webenginewidgets/api/qwebenginehistory_p.h +++ b/src/webenginewidgets/api/qwebenginehistory_p.h @@ -37,6 +37,17 @@ #ifndef QWEBENGINEHISTORY_P_H #define QWEBENGINEHISTORY_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include QT_BEGIN_NAMESPACE diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h index 8f45ecddf..0fcd05d3c 100644 --- a/src/webenginewidgets/api/qwebenginepage_p.h +++ b/src/webenginewidgets/api/qwebenginepage_p.h @@ -37,6 +37,17 @@ #ifndef QWEBENGINEPAGE_P_H #define QWEBENGINEPAGE_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qwebenginepage.h" #include "qwebenginescriptcollection.h" diff --git a/src/webenginewidgets/api/qwebengineprofile_p.h b/src/webenginewidgets/api/qwebengineprofile_p.h index 55941580d..ee3ea57d8 100644 --- a/src/webenginewidgets/api/qwebengineprofile_p.h +++ b/src/webenginewidgets/api/qwebengineprofile_p.h @@ -37,6 +37,17 @@ #ifndef QWEBENGINEPROFILE_P_H #define QWEBENGINEPROFILE_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "browser_context_adapter_client.h" #include "qwebengineprofile.h" #include "qwebengineurlschemehandler_p.h" diff --git a/src/webenginewidgets/api/qwebenginescriptcollection_p.h b/src/webenginewidgets/api/qwebenginescriptcollection_p.h index 76267c70c..cc6e88445 100644 --- a/src/webenginewidgets/api/qwebenginescriptcollection_p.h +++ b/src/webenginewidgets/api/qwebenginescriptcollection_p.h @@ -37,6 +37,17 @@ #ifndef QWEBENGINESCRIPTCOLLECTION_P_H #define QWEBENGINESCRIPTCOLLECTION_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qtwebenginewidgetsglobal.h" #include "qwebenginescript.h" diff --git a/src/webenginewidgets/api/qwebengineurlrequestjob_p.h b/src/webenginewidgets/api/qwebengineurlrequestjob_p.h index aa39c5adc..32e2498fa 100644 --- a/src/webenginewidgets/api/qwebengineurlrequestjob_p.h +++ b/src/webenginewidgets/api/qwebengineurlrequestjob_p.h @@ -37,6 +37,17 @@ #ifndef QWEBENGINEURLREQUESTJOB_H #define QWEBENGINEURLREQUESTJOB_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qtwebenginewidgetsglobal.h" #include diff --git a/src/webenginewidgets/api/qwebengineurlschemehandler_p.h b/src/webenginewidgets/api/qwebengineurlschemehandler_p.h index b1c189bc4..7de87dff2 100644 --- a/src/webenginewidgets/api/qwebengineurlschemehandler_p.h +++ b/src/webenginewidgets/api/qwebengineurlschemehandler_p.h @@ -37,6 +37,17 @@ #ifndef QWEBENGINEURLSCHEMEHANDLER_H #define QWEBENGINEURLSCHEMEHANDLER_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qtwebenginewidgetsglobal.h" #include diff --git a/src/webenginewidgets/api/qwebengineurlschemehandler_p_p.h b/src/webenginewidgets/api/qwebengineurlschemehandler_p_p.h index 8472f5319..d349d7d8c 100644 --- a/src/webenginewidgets/api/qwebengineurlschemehandler_p_p.h +++ b/src/webenginewidgets/api/qwebengineurlschemehandler_p_p.h @@ -37,6 +37,17 @@ #ifndef QWEBENGINEURLSCHEMEHANDLER_P_H #define QWEBENGINEURLSCHEMEHANDLER_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qwebengineurlschemehandler_p.h" #include "custom_url_scheme_handler.h" diff --git a/src/webenginewidgets/api/qwebengineview_p.h b/src/webenginewidgets/api/qwebengineview_p.h index b69a27ac2..af8bc70ac 100644 --- a/src/webenginewidgets/api/qwebengineview_p.h +++ b/src/webenginewidgets/api/qwebengineview_p.h @@ -37,6 +37,17 @@ #ifndef QWEBENGINEVIEW_P_H #define QWEBENGINEVIEW_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include #include diff --git a/src/webenginewidgets/ui/messagebubblewidget_p.h b/src/webenginewidgets/ui/messagebubblewidget_p.h index 46b36149a..28ccf1b13 100644 --- a/src/webenginewidgets/ui/messagebubblewidget_p.h +++ b/src/webenginewidgets/ui/messagebubblewidget_p.h @@ -37,6 +37,17 @@ #ifndef MESSAGEBUBBLEWIDGET_P_H #define MESSAGEBUBBLEWIDGET_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include #include -- cgit v1.2.3 From 1a95aeaa05ddca83df9648e96dad6e40054b3bec Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Fri, 17 Jul 2015 10:06:13 +0200 Subject: Fix docs to use iconUrl/iconUrlChanged. The docs presumably were copied from QtWebKit and this didn't get adjusted when icon()/iconChanged() was changed to iconUrl()/iconUrlChanged(). Change-Id: Iccecc7b0e1c69f5242bddae2dedb4135120e3519 Reviewed-by: Joerg Bornemann --- src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc | 4 ++-- src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/webenginewidgets') diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc index 080f4796a..b4265a595 100644 --- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc @@ -50,8 +50,8 @@ The title of an HTML page can be accessed with the title() property. Additionally, a page may also specify an icon, which can be accessed - using the icon() property. If the title or the icon changes, the - corresponding titleChanged() and iconChanged() signals will be emitted. + using the iconUrl() property. If the title or the icon changes, the + corresponding titleChanged() and iconUrlChanged() signals will be emitted. The zoomFactor() property can be used to change the overall size of the content displayed in the page. diff --git a/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc index 4f9a4b4be..163e9a28e 100644 --- a/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc @@ -59,8 +59,8 @@ The title of an HTML document can be accessed with the title() property. Additionally, a web site may also specify an icon, which can be accessed - using the icon() property. If the title or the icon changes, the corresponding - titleChanged() and iconChanged() signals will be emitted. The + using the iconUrl() property. If the title or the icon changes, the corresponding + titleChanged() and iconUrlChanged() signals will be emitted. The textSizeMultiplier() property can be used to change the overall size of the text displayed in the web view. -- cgit v1.2.3 From 67280b04914d5b1e36ceb91d759dcc139368051d Mon Sep 17 00:00:00 2001 From: Pierre Rossi Date: Tue, 4 Aug 2015 14:53:00 +0200 Subject: Doc: Fixup QWebEngineScript documentation. drop the preliminary as it is public API, and fix a typo. Change-Id: I2753ef06f9afc9f7a9526353286fb22d239e3b5f Reviewed-by: Andras Becsi --- src/webenginewidgets/api/qwebenginescript.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/webenginewidgets') diff --git a/src/webenginewidgets/api/qwebenginescript.cpp b/src/webenginewidgets/api/qwebenginescript.cpp index e834c5067..e47766f4c 100644 --- a/src/webenginewidgets/api/qwebenginescript.cpp +++ b/src/webenginewidgets/api/qwebenginescript.cpp @@ -46,9 +46,8 @@ using QtWebEngineCore::UserScript; \inmodule QtWebEngineWidgets \since 5.5 \brief The QWebEngineScript class encapsulates a JavaScript program. - \preliminary - QWebEngineScript allows the programatic injection of so called "user scripts" in the + QWebEngineScript allows the programmatic injection of so called "user scripts" in the javascript engine at different points, determined by injectionPoint(), during the loading of web contents. Scripts can be executed either in the main javascript world, along with the rest of the JavaScript coming -- cgit v1.2.3 From 17bc5b29783ff922c065324a2318bec3deb79cb1 Mon Sep 17 00:00:00 2001 From: Venugopal Shivashankar Date: Fri, 31 Jul 2015 11:51:19 +0200 Subject: Doc: Added a note about setting feature permission to a page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The feature premissions set ahead of a feature request has no effect. The QWebEnginePage::setFeaturePermission method serves pending feature requests only. Task-number: QTBUG-47173 Change-Id: Ifff4dadc56fae1ecdcce9029a15d57576a830923 Reviewed-by: Topi Reiniö --- src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/webenginewidgets') diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc index b4265a595..40c5c8d04 100644 --- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc @@ -570,6 +570,10 @@ Sets the permission for the web site identified by \a securityOrigin to use \a feature to \a policy. + \note Call this method on featurePermissionRequested() signal, as it is + meant to serve pending feature requests only. Setting feature permissions + ahead of a request has no effect. + \sa featurePermissionRequested(), featurePermissionRequestCanceled() */ -- cgit v1.2.3