diff options
author | Michal Klocek <michal.klocek@qt.io> | 2021-06-01 17:26:36 +0200 |
---|---|---|
committer | Michal Klocek <michal.klocek@qt.io> | 2021-06-15 12:58:21 +0200 |
commit | 5f723fe7469ac9ce3373dbcd3eb0978595271514 (patch) | |
tree | 6db35aad83bad5db726b6948740fb5504f5430b0 /src/webenginequick/api/qtwebengineglobal.cpp | |
parent | 31616ac94abad3e3d57b4b2d51858106655a85dd (diff) | |
download | qtwebengine-5f723fe7469ac9ce3373dbcd3eb0978595271514.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()
Pick-to: 6.2
Change-Id: I90acab04ff0240b399a863c88eff915efa360f6f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/webenginequick/api/qtwebengineglobal.cpp')
-rw-r--r-- | src/webenginequick/api/qtwebengineglobal.cpp | 88 |
1 files changed, 0 insertions, 88 deletions
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 <QCoreApplication> -#include <QQuickWindow> - -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 |