From 5f723fe7469ac9ce3373dbcd3eb0978595271514 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Tue, 1 Jun 2021 17:26:36 +0200 Subject: Fix QWebEngineQuick namespace for webenginequick module This is followup change for QtWebEngineQuick rename. [ChangeLog][QtWebEngineQuick] Use namespace QtWebEngineQuick QtWebEngine::initialize() is now QtWebEnigneQuick::initialize() Pick-to: 6.2 Change-Id: I90acab04ff0240b399a863c88eff915efa360f6f Reviewed-by: Allan Sandfeld Jensen --- src/webenginequick/CMakeLists.txt | 3 +- src/webenginequick/api/qquickwebengineaction_p.h | 2 +- src/webenginequick/api/qquickwebengineaction_p_p.h | 2 +- .../qquickwebengineclientcertificateselection_p.h | 2 +- .../api/qquickwebenginedialogrequests_p.h | 2 +- .../api/qquickwebenginefaviconprovider_p_p.h | 2 +- src/webenginequick/api/qquickwebengineprofile.h | 2 +- .../api/qquickwebenginescriptcollection.h | 2 +- src/webenginequick/api/qquickwebenginesettings_p.h | 2 +- .../api/qquickwebenginesingleton_p.h | 2 +- .../api/qquickwebenginetestsupport_p.h | 2 +- .../api/qquickwebenginetouchhandleprovider_p_p.h | 2 +- src/webenginequick/api/qquickwebengineview_p.h | 2 +- src/webenginequick/api/qtwebengineglobal.cpp | 88 ---------------------- src/webenginequick/api/qtwebengineglobal.h | 65 ---------------- src/webenginequick/api/qtwebengineglobal_p.h | 64 ---------------- src/webenginequick/api/qtwebenginequickglobal.cpp | 88 ++++++++++++++++++++++ src/webenginequick/api/qtwebenginequickglobal.h | 65 ++++++++++++++++ src/webenginequick/api/qtwebenginequickglobal_p.h | 64 ++++++++++++++++ .../doc/src/qtwebengine-debugging.qdoc | 2 +- .../doc/src/qtwebengine-overview.qdoc | 8 +- src/webenginequick/doc/src/webengineview_lgpl.qdoc | 4 +- 22 files changed, 238 insertions(+), 237 deletions(-) delete mode 100644 src/webenginequick/api/qtwebengineglobal.cpp delete mode 100644 src/webenginequick/api/qtwebengineglobal.h delete mode 100644 src/webenginequick/api/qtwebengineglobal_p.h create mode 100644 src/webenginequick/api/qtwebenginequickglobal.cpp create mode 100644 src/webenginequick/api/qtwebenginequickglobal.h create mode 100644 src/webenginequick/api/qtwebenginequickglobal_p.h (limited to 'src/webenginequick') diff --git a/src/webenginequick/CMakeLists.txt b/src/webenginequick/CMakeLists.txt index 9434d6908..dd4c8cd39 100644 --- a/src/webenginequick/CMakeLists.txt +++ b/src/webenginequick/CMakeLists.txt @@ -21,7 +21,8 @@ qt_internal_add_module(WebEngineQuick api/qquickwebenginetouchhandleprovider_p_p.h api/qquickwebengineview.cpp api/qquickwebengineview_p.h api/qquickwebengineview_p_p.h - api/qtwebengineglobal.cpp api/qtwebengineglobal.h api/qtwebengineglobal_p.h + api/qtwebenginequickglobal.cpp api/qtwebenginequickglobal.h + api/qtwebenginequickglobal_p.h render_widget_host_view_qt_delegate_quick.cpp render_widget_host_view_qt_delegate_quick.h render_widget_host_view_qt_delegate_quickwindow.cpp render_widget_host_view_qt_delegate_quickwindow.h ui_delegates_manager.cpp ui_delegates_manager.h diff --git a/src/webenginequick/api/qquickwebengineaction_p.h b/src/webenginequick/api/qquickwebengineaction_p.h index 8f5f3386c..c429d8917 100644 --- a/src/webenginequick/api/qquickwebengineaction_p.h +++ b/src/webenginequick/api/qquickwebengineaction_p.h @@ -53,7 +53,7 @@ #include #include -#include "qtwebengineglobal_p.h" +#include "qtwebenginequickglobal_p.h" #include namespace QtWebEngineCore { diff --git a/src/webenginequick/api/qquickwebengineaction_p_p.h b/src/webenginequick/api/qquickwebengineaction_p_p.h index d2ead30e9..e5093f89f 100644 --- a/src/webenginequick/api/qquickwebengineaction_p_p.h +++ b/src/webenginequick/api/qquickwebengineaction_p_p.h @@ -52,7 +52,7 @@ // #include -#include "qtwebengineglobal_p.h" +#include "qtwebenginequickglobal_p.h" #include QT_BEGIN_NAMESPACE diff --git a/src/webenginequick/api/qquickwebengineclientcertificateselection_p.h b/src/webenginequick/api/qquickwebengineclientcertificateselection_p.h index a62150404..1e05f4fcd 100644 --- a/src/webenginequick/api/qquickwebengineclientcertificateselection_p.h +++ b/src/webenginequick/api/qquickwebengineclientcertificateselection_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include +#include #include #include diff --git a/src/webenginequick/api/qquickwebenginedialogrequests_p.h b/src/webenginequick/api/qquickwebenginedialogrequests_p.h index f3b5997d0..f4c206875 100644 --- a/src/webenginequick/api/qquickwebenginedialogrequests_p.h +++ b/src/webenginequick/api/qquickwebenginedialogrequests_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include +#include #include #include #include diff --git a/src/webenginequick/api/qquickwebenginefaviconprovider_p_p.h b/src/webenginequick/api/qquickwebenginefaviconprovider_p_p.h index d284a73d5..922f8b3ac 100644 --- a/src/webenginequick/api/qquickwebenginefaviconprovider_p_p.h +++ b/src/webenginequick/api/qquickwebenginefaviconprovider_p_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include +#include #include #include diff --git a/src/webenginequick/api/qquickwebengineprofile.h b/src/webenginequick/api/qquickwebengineprofile.h index 93a7fbfdc..8d71d3303 100644 --- a/src/webenginequick/api/qquickwebengineprofile.h +++ b/src/webenginequick/api/qquickwebengineprofile.h @@ -40,7 +40,7 @@ #ifndef QQUICKWEBENGINEPROFILE_H #define QQUICKWEBENGINEPROFILE_H -#include +#include #include #include #include diff --git a/src/webenginequick/api/qquickwebenginescriptcollection.h b/src/webenginequick/api/qquickwebenginescriptcollection.h index e125fee96..b296ecbf4 100644 --- a/src/webenginequick/api/qquickwebenginescriptcollection.h +++ b/src/webenginequick/api/qquickwebenginescriptcollection.h @@ -40,7 +40,7 @@ #ifndef QQUICKWEBENGINESCRIPTCOLLECTION_H #define QQUICKWEBENGINESCRIPTCOLLECTION_H -#include +#include #include #include #include diff --git a/src/webenginequick/api/qquickwebenginesettings_p.h b/src/webenginequick/api/qquickwebenginesettings_p.h index f400172e1..f3c55693b 100644 --- a/src/webenginequick/api/qquickwebenginesettings_p.h +++ b/src/webenginequick/api/qquickwebenginesettings_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include +#include #include #include diff --git a/src/webenginequick/api/qquickwebenginesingleton_p.h b/src/webenginequick/api/qquickwebenginesingleton_p.h index 224bfa495..9dc7090d8 100644 --- a/src/webenginequick/api/qquickwebenginesingleton_p.h +++ b/src/webenginequick/api/qquickwebenginesingleton_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include +#include #include #include diff --git a/src/webenginequick/api/qquickwebenginetestsupport_p.h b/src/webenginequick/api/qquickwebenginetestsupport_p.h index 8f8bfde4d..853c7cbde 100644 --- a/src/webenginequick/api/qquickwebenginetestsupport_p.h +++ b/src/webenginequick/api/qquickwebenginetestsupport_p.h @@ -52,7 +52,7 @@ // #include -#include +#include #include #include diff --git a/src/webenginequick/api/qquickwebenginetouchhandleprovider_p_p.h b/src/webenginequick/api/qquickwebenginetouchhandleprovider_p_p.h index 8f5f8cc94..fac136fe6 100644 --- a/src/webenginequick/api/qquickwebenginetouchhandleprovider_p_p.h +++ b/src/webenginequick/api/qquickwebenginetouchhandleprovider_p_p.h @@ -52,7 +52,7 @@ // #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/webenginequick/api/qquickwebengineview_p.h b/src/webenginequick/api/qquickwebengineview_p.h index 0ec0e91e1..b3c092856 100644 --- a/src/webenginequick/api/qquickwebengineview_p.h +++ b/src/webenginequick/api/qquickwebengineview_p.h @@ -52,7 +52,7 @@ // #include -#include +#include #include #include diff --git a/src/webenginequick/api/qtwebengineglobal.cpp b/src/webenginequick/api/qtwebengineglobal.cpp deleted file mode 100644 index 7d2b91e90..000000000 --- a/src/webenginequick/api/qtwebengineglobal.cpp +++ /dev/null @@ -1,88 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWebEngine module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://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.LGPL3 included in the -** 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-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qtwebengineglobal.h" -#include -#include - -namespace QtWebEngineCore -{ - extern void initialize(); -} - -QT_BEGIN_NAMESPACE - -namespace QtWebEngine { - -/*! - \namespace QtWebEngine - \inmodule QtWebEngine - \ingroup qtwebengine-namespaces - \keyword QtWebEngine Namespace - - \brief Helper functions for the \QWE (Qt Quick) module. - - The \l[CPP]{QtWebEngine} namespace is part of the \QWE module. -*/ - -/*! - \fn QtWebEngine::initialize() - - Sets up an OpenGL Context that can be shared between threads. This has to be done before - QGuiApplication is created and before window's QPlatformOpenGLContext is created. - - This has the same effect as setting the Qt::AA_ShareOpenGLContexts - attribute with QCoreApplication::setAttribute before constructing - QGuiApplication. -*/ -void initialize() -{ - if (!QCoreApplication::startingUp()) { - qWarning("QtWebEngine::initialize() called with QCoreApplication object already created and should be call before. "\ - "This is depreciated and may fail in the future."); - QtWebEngineCore::initialize(); - return; - } - // call initialize the same way as widgets do - qAddPreRoutine(QtWebEngineCore::initialize); - QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGLRhi); -} -} // namespace QtWebEngine - -QT_END_NAMESPACE diff --git a/src/webenginequick/api/qtwebengineglobal.h b/src/webenginequick/api/qtwebengineglobal.h deleted file mode 100644 index 50a91b745..000000000 --- a/src/webenginequick/api/qtwebengineglobal.h +++ /dev/null @@ -1,65 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWebEngine module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://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.LGPL3 included in the -** 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-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QTWEBENGINEGLOBAL_H -#define QTWEBENGINEGLOBAL_H - -#include -#include - -QT_BEGIN_NAMESPACE - -#ifndef QT_STATIC -# if defined(QT_BUILD_WEBENGINE_LIB) -# define Q_WEBENGINE_EXPORT Q_DECL_EXPORT -# else -# define Q_WEBENGINE_EXPORT Q_DECL_IMPORT -# endif -#else -# define Q_WEBENGINE_EXPORT -#endif - -namespace QtWebEngine -{ - Q_WEBENGINE_EXPORT void initialize(); -} - -QT_END_NAMESPACE - -#endif // QTWEBENGINEGLOBAL_H diff --git a/src/webenginequick/api/qtwebengineglobal_p.h b/src/webenginequick/api/qtwebengineglobal_p.h deleted file mode 100644 index 549de30d2..000000000 --- a/src/webenginequick/api/qtwebengineglobal_p.h +++ /dev/null @@ -1,64 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWebEngine module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://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.LGPL3 included in the -** 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-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QTWEBENGINEGLOBAL_P_H -#define QTWEBENGINEGLOBAL_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 -#include - -QT_BEGIN_NAMESPACE - -#define Q_WEBENGINE_PRIVATE_EXPORT Q_WEBENGINE_EXPORT - -QT_END_NAMESPACE - -#endif // QTWEBENGINEGLOBAL_P_H diff --git a/src/webenginequick/api/qtwebenginequickglobal.cpp b/src/webenginequick/api/qtwebenginequickglobal.cpp new file mode 100644 index 000000000..68e4a7c3b --- /dev/null +++ b/src/webenginequick/api/qtwebenginequickglobal.cpp @@ -0,0 +1,88 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtWebEngine module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** 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 The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://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.LGPL3 included in the +** 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-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include +#include + +namespace QtWebEngineCore +{ + extern void initialize(); +} + +QT_BEGIN_NAMESPACE + +namespace QtWebEngineQuick { + +/*! + \namespace QtWebEngineQuick + \inmodule QtWebEngineQuick + \ingroup qtwebengine-namespaces + \keyword QtWebEngine Namespace + + \brief Helper functions for the \QWE (Qt Quick) module. + + The \l[CPP]{QtWebEngineQuick} namespace is part of the \QWE module. +*/ + +/*! + \fn QtWebEngineQuick::initialize() + + Sets up an OpenGL Context that can be shared between threads. This has to be done before + QGuiApplication is created and before window's QPlatformOpenGLContext is created. + + This has the same effect as setting the Qt::AA_ShareOpenGLContexts + attribute with QCoreApplication::setAttribute before constructing + QGuiApplication. +*/ +void initialize() +{ + if (!QCoreApplication::startingUp()) { + qWarning("QtWebEngineQuick::initialize() called with QCoreApplication object already created and should be call before. "\ + "This is depreciated and may fail in the future."); + QtWebEngineCore::initialize(); + return; + } + // call initialize the same way as widgets do + qAddPreRoutine(QtWebEngineCore::initialize); + QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGLRhi); +} +} // namespace QtWebEngineQuick + +QT_END_NAMESPACE diff --git a/src/webenginequick/api/qtwebenginequickglobal.h b/src/webenginequick/api/qtwebenginequickglobal.h new file mode 100644 index 000000000..c94bd66d3 --- /dev/null +++ b/src/webenginequick/api/qtwebenginequickglobal.h @@ -0,0 +1,65 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtWebEngine module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** 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 The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://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.LGPL3 included in the +** 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-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QTWEBENGINEQUICKGLOBAL_H +#define QTWEBENGINEQUICKGLOBAL_H + +#include +#include + +QT_BEGIN_NAMESPACE + +#ifndef QT_STATIC +# if defined(QT_BUILD_WEBENGINE_LIB) +# define Q_WEBENGINE_EXPORT Q_DECL_EXPORT +# else +# define Q_WEBENGINE_EXPORT Q_DECL_IMPORT +# endif +#else +# define Q_WEBENGINE_EXPORT +#endif + +namespace QtWebEngineQuick +{ + Q_WEBENGINE_EXPORT void initialize(); +} + +QT_END_NAMESPACE + +#endif // QTWEBENGINEQUICKGLOBAL_H diff --git a/src/webenginequick/api/qtwebenginequickglobal_p.h b/src/webenginequick/api/qtwebenginequickglobal_p.h new file mode 100644 index 000000000..5d8909c18 --- /dev/null +++ b/src/webenginequick/api/qtwebenginequickglobal_p.h @@ -0,0 +1,64 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtWebEngine module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** 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 The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://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.LGPL3 included in the +** 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-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QTWEBENGINEQUICKGLOBAL_P_H +#define QTWEBENGINEQUICKGLOBAL_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 +#include + +QT_BEGIN_NAMESPACE + +#define Q_WEBENGINE_PRIVATE_EXPORT Q_WEBENGINE_EXPORT + +QT_END_NAMESPACE + +#endif // QTWEBENGINEQUICKGLOBAL_P_H diff --git a/src/webenginequick/doc/src/qtwebengine-debugging.qdoc b/src/webenginequick/doc/src/qtwebengine-debugging.qdoc index 0db35c85c..f84cca312 100644 --- a/src/webenginequick/doc/src/qtwebengine-debugging.qdoc +++ b/src/webenginequick/doc/src/qtwebengine-debugging.qdoc @@ -113,5 +113,5 @@ \endcode QTWEBENGINE_CHROMIUM_FLAGS can also be set using {qputenv} from within the - application if called before QtWebEngine::initialize(). + application if called before QtWebEngineQuick::initialize(). */ diff --git a/src/webenginequick/doc/src/qtwebengine-overview.qdoc b/src/webenginequick/doc/src/qtwebengine-overview.qdoc index 4cbe35bcc..c7aaffc4e 100644 --- a/src/webenginequick/doc/src/qtwebengine-overview.qdoc +++ b/src/webenginequick/doc/src/qtwebengine-overview.qdoc @@ -123,14 +123,14 @@ For a widget based application, the web engine is automatically initialized, unless it is placed in a plugin. In that case, it must be initialized in the application main source file - by using \l QtWebEngine::initialize, as illustrated by the following code snippet: + by using \l QtWebEngineQuick::initialize, as illustrated by the following code snippet: \code int main(int argc, char **argv) { QApplication app(argc, argv); - QtWebEngine::initialize(); + QtWebEngineQuick::initialize(); QMainWindow window; window.show(); @@ -146,7 +146,7 @@ full screen as specified within the Qt Quick application. To make sure that OpenGL context can be shared between the GUI and render processes, the web - engine must be initialized by using \l QtWebEngine::initialize in the application main source + engine must be initialized by using \l QtWebEngineQuick::initialize in the application main source file, as illustrated by the following code snippet: \code @@ -154,7 +154,7 @@ { QGuiApplication app(argc, argv); - QtWebEngine::initialize(); + QtWebEngineQuick::initialize(); QQmlApplicationEngine engine; engine.load(QUrl("qrc:/main.qml")); diff --git a/src/webenginequick/doc/src/webengineview_lgpl.qdoc b/src/webenginequick/doc/src/webengineview_lgpl.qdoc index 498088a4a..1ea484703 100644 --- a/src/webenginequick/doc/src/webengineview_lgpl.qdoc +++ b/src/webenginequick/doc/src/webengineview_lgpl.qdoc @@ -38,7 +38,7 @@ \section2 Initializing Web Engine For the web engine view to be rendered, the web engine must be initialized by using - \l QtWebEngine::initialize in the application main source file, as illustrated by the + \l QtWebEngineQuick::initialize in the application main source file, as illustrated by the following code snippet: \quotefromfile webengine/minimal/main.cpp @@ -137,7 +137,7 @@ When using a QQuickRenderControl to render a Qt Quick user interface to an OpenGL surface, the WebEngineView type is not rendered correctly. The web engine view attempts to use a global - OpenGL context created by \l QtWebEngine::initialize, but there is no public API for accessing + OpenGL context created by \l QtWebEngineQuick::initialize, but there is no public API for accessing that context in order to share it with the \c QQuickRenderControl context. To have the web engine view rendered correctly, it is possible to manually create a new -- cgit v1.2.3