diff options
author | Michal Klocek <michal.klocek@qt.io> | 2018-10-16 14:54:36 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-01-21 11:40:35 +0000 |
commit | e85835c5a824c1979ace67aa3940c0fbdca40fd6 (patch) | |
tree | ae22fac7380308895c3d5142d7e73a6a1e6d88b0 /src/webengine/plugin | |
parent | 819182302d5bdaba41efb68ef3c533b2acc19ae1 (diff) |
Add configure for webengine and webenginewidgets
Add possibility to build without widgets or qml support.
Move module related options to webengine's subconfigure.
Make proper dependencies between qml_module and qml_plugins.
Cleanup headers.
Fixes: QTBUG-68956
Task-number: QTBUG-70784
Change-Id: I4605d98b0d2c83c99af37e2186b5fbf10f8a6049
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/webengine/plugin')
-rw-r--r-- | src/webengine/plugin/plugin.cpp | 31 | ||||
-rw-r--r-- | src/webengine/plugin/plugin.pro | 4 | ||||
-rw-r--r-- | src/webengine/plugin/testsupport/plugin.cpp | 70 | ||||
-rw-r--r-- | src/webengine/plugin/testsupport/qmldir | 4 | ||||
-rw-r--r-- | src/webengine/plugin/testsupport/testsupport.pro | 13 |
5 files changed, 16 insertions, 106 deletions
diff --git a/src/webengine/plugin/plugin.cpp b/src/webengine/plugin/plugin.cpp index 16f1bd593..9fab3e9ce 100644 --- a/src/webengine/plugin/plugin.cpp +++ b/src/webengine/plugin/plugin.cpp @@ -40,22 +40,21 @@ #include <QtQml/qqmlextensionplugin.h> #include <QtWebEngine/QQuickWebEngineProfile> -#include "qquickwebenginecertificateerror_p.h" -#include "qquickwebenginecontextmenurequest_p.h" -#include "qquickwebenginedialogrequests_p.h" -#include "qquickwebenginedownloaditem_p.h" -#include "qquickwebenginehistory_p.h" -#include "qquickwebenginefaviconprovider_p_p.h" -#include "qquickwebengineloadrequest_p.h" -#include "qquickwebenginenavigationrequest_p.h" -#include "qquickwebenginenewviewrequest_p.h" -#include "qquickwebenginesettings_p.h" -#include "qquickwebenginesingleton_p.h" -#include "qquickwebengineview_p.h" -#include "qquickwebengineaction_p.h" -#include "qwebenginequotarequest.h" -#include "qwebengineregisterprotocolhandlerrequest.h" -#include "qtwebengineversion.h" +#include <QtWebEngine/private/qquickwebenginecertificateerror_p.h> +#include <QtWebEngine/private/qquickwebenginecontextmenurequest_p.h> +#include <QtWebEngine/private/qquickwebenginedialogrequests_p.h> +#include <QtWebEngine/private/qquickwebenginedownloaditem_p.h> +#include <QtWebEngine/private/qquickwebenginehistory_p.h> +#include <QtWebEngine/private/qquickwebenginefaviconprovider_p_p.h> +#include <QtWebEngine/private/qquickwebengineloadrequest_p.h> +#include <QtWebEngine/private/qquickwebenginenavigationrequest_p.h> +#include <QtWebEngine/private/qquickwebenginenewviewrequest_p.h> +#include <QtWebEngine/private/qquickwebenginesettings_p.h> +#include <QtWebEngine/private/qquickwebenginesingleton_p.h> +#include <QtWebEngine/private/qquickwebengineview_p.h> +#include <QtWebEngine/private/qquickwebengineaction_p.h> +#include <QtWebEngineCore/qwebenginequotarequest.h> +#include <QtWebEngineCore/qwebengineregisterprotocolhandlerrequest.h> QT_BEGIN_NAMESPACE diff --git a/src/webengine/plugin/plugin.pro b/src/webengine/plugin/plugin.pro index b6652fa26..c3702e81d 100644 --- a/src/webengine/plugin/plugin.pro +++ b/src/webengine/plugin/plugin.pro @@ -3,11 +3,9 @@ TARGET = qtwebengineplugin TARGETPATH = QtWebEngine IMPORT_VERSION = 1.8 -QT += webengine qml quick +QT += qml quick QT_PRIVATE += core-private webenginecore-private webengine-private -INCLUDEPATH += $$QTWEBENGINE_ROOT/src/core $$QTWEBENGINE_ROOT/src/core/api $$QTWEBENGINE_ROOT/src/webengine $$QTWEBENGINE_ROOT/src/webengine/api $$QTWEBENGINE_ROOT/include/QtWebEngine - SOURCES = plugin.cpp load(qml_plugin) diff --git a/src/webengine/plugin/testsupport/plugin.cpp b/src/webengine/plugin/testsupport/plugin.cpp deleted file mode 100644 index d5c43a859..000000000 --- a/src/webengine/plugin/testsupport/plugin.cpp +++ /dev/null @@ -1,70 +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 <QtQml> - -#include "qquickwebenginetestsupport_p.h" - -QT_BEGIN_NAMESPACE - -class QtWebEngineTestSupportPlugin : public QQmlExtensionPlugin -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) -public: - virtual void registerTypes(const char *uri) - { - qWarning("\nWARNING: This project is using the testsupport QML API extensions for QtWebEngine and is therefore tied to a specific QtWebEngine release.\n" - "WARNING: The testsupport API will change from version to version, or even be removed. You have been warned!\n"); - - Q_ASSERT(QLatin1String(uri) == QLatin1String("QtWebEngine.testsupport")); - - qmlRegisterType<QQuickWebEngineTestSupport>(uri, 1, 0, "WebEngineTestSupport"); - qmlRegisterUncreatableType<QQuickWebEngineErrorPage>(uri, 1, 0, "WebEngineErrorPage", - tr("Cannot create a separate instance of WebEngineErrorPage")); - qmlRegisterUncreatableType<QQuickWebEngineTestInputContext>(uri, 1, 0, "TestInputContext", - tr("Cannot create a separate instance of WebEngineErrorPage")); - qmlRegisterUncreatableType<QQuickWebEngineTestEvent>(uri, 1, 0, "WebEngineTestEvent", - tr("Cannot create a separate instance of WebEngineTestEvent")); - } -}; - -QT_END_NAMESPACE - -#include "plugin.moc" diff --git a/src/webengine/plugin/testsupport/qmldir b/src/webengine/plugin/testsupport/qmldir deleted file mode 100644 index 7fff80251..000000000 --- a/src/webengine/plugin/testsupport/qmldir +++ /dev/null @@ -1,4 +0,0 @@ -module QtWebEngine.testsupport -plugin qtwebenginetestsupportplugin -classname QtWebEngineTestSupportPlugin -typeinfo plugins.qmltypes diff --git a/src/webengine/plugin/testsupport/testsupport.pro b/src/webengine/plugin/testsupport/testsupport.pro deleted file mode 100644 index 2804635f8..000000000 --- a/src/webengine/plugin/testsupport/testsupport.pro +++ /dev/null @@ -1,13 +0,0 @@ -CXX_MODULE = qml -TARGET = qtwebenginetestsupportplugin -TARGETPATH = QtWebEngine/testsupport -IMPORT_VERSION = 1.0 - -QT += webengine qml quick -QT_PRIVATE += webengine-private gui-private - -INCLUDEPATH += $$QTWEBENGINE_ROOT/src/core $$QTWEBENGINE_ROOT/src/webengine $$QTWEBENGINE_ROOT/src/webengine/api - -SOURCES = plugin.cpp - -load(qml_plugin) |