diff options
author | Michal Klocek <michal.klocek@qt.io> | 2021-06-01 17:26:36 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-15 17:29:50 +0000 |
commit | 5f4fb14cb0f6b443885e79516f450853e44f650d (patch) | |
tree | aefc9b4cea1e64ea51f02c5d99ce22206d87488c /src/webenginequick/api/qtwebenginequickglobal.cpp | |
parent | 8d23c52719a23dea77a75a959ca3462e38de259c (diff) | |
download | qtwebengine-5f4fb14cb0f6b443885e79516f450853e44f650d.tar.gz |
Fix QWebEngineQuick namespace for webenginequick module
This is followup change for QtWebEngineQuick rename.
[ChangeLog][QtWebEngineQuick] Use namespace QtWebEngineQuick
QtWebEngine::initialize() is now QtWebEnigneQuick::initialize()
Change-Id: I90acab04ff0240b399a863c88eff915efa360f6f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 5f723fe7469ac9ce3373dbcd3eb0978595271514)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/webenginequick/api/qtwebenginequickglobal.cpp')
-rw-r--r-- | src/webenginequick/api/qtwebenginequickglobal.cpp | 88 |
1 files changed, 88 insertions, 0 deletions
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 <QtWebEngineQuick/qtwebenginequickglobal.h> +#include <QCoreApplication> +#include <QQuickWindow> + +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 |