diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/core/api/core_api.pro | 7 | ||||
-rw-r--r-- | src/core/api/qwebenginescriptcollection.cpp (renamed from src/webenginewidgets/api/qwebenginescriptcollection.cpp) | 2 | ||||
-rw-r--r-- | src/core/api/qwebenginescriptcollection.h (renamed from src/webenginewidgets/api/qwebenginescriptcollection.h) | 7 | ||||
-rw-r--r-- | src/core/api/qwebenginescriptcollection_p.h (renamed from src/webenginewidgets/api/qwebenginescriptcollection_p.h) | 7 | ||||
-rw-r--r-- | src/webenginewidgets/webenginewidgets.pro | 3 |
5 files changed, 12 insertions, 14 deletions
diff --git a/src/core/api/core_api.pro b/src/core/api/core_api.pro index 33b54a341..68a14514f 100644 --- a/src/core/api/core_api.pro +++ b/src/core/api/core_api.pro @@ -57,7 +57,9 @@ HEADERS = \ qwebenginedownloadrequest.h \ qwebenginedownloadrequest_p.h \ qwebenginesettings.h \ - qwebenginescript.h + qwebenginescript.h \ + qwebenginescriptcollection.h \ + qwebenginescriptcollection_p.h SOURCES = \ qtwebenginecoreglobal.cpp \ @@ -78,7 +80,8 @@ SOURCES = \ qwebenginecontextmenurequest.cpp \ qwebenginedownloadrequest.cpp \ qwebenginesettings.cpp \ - qwebenginescript.cpp + qwebenginescript.cpp \ + qwebenginescriptcollection.cpp # Chromium headers included are not remotely clean CONFIG -= warning_clean diff --git a/src/webenginewidgets/api/qwebenginescriptcollection.cpp b/src/core/api/qwebenginescriptcollection.cpp index 8cbeeb804..087aad4cb 100644 --- a/src/webenginewidgets/api/qwebenginescriptcollection.cpp +++ b/src/core/api/qwebenginescriptcollection.cpp @@ -46,7 +46,7 @@ using QtWebEngineCore::UserScript; /*! \class QWebEngineScriptCollection - \inmodule QtWebEngineWidgets + \inmodule QtWebEngineCore \since 5.5 \brief The QWebEngineScriptCollection class represents a collection of user scripts. diff --git a/src/webenginewidgets/api/qwebenginescriptcollection.h b/src/core/api/qwebenginescriptcollection.h index d4fad934d..511ee2531 100644 --- a/src/webenginewidgets/api/qwebenginescriptcollection.h +++ b/src/core/api/qwebenginescriptcollection.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtWebEngine module of the Qt Toolkit. @@ -40,9 +40,8 @@ #ifndef QWEBENGINESCRIPTCOLLECTION_H #define QWEBENGINESCRIPTCOLLECTION_H -#include <QtWebEngineWidgets/qtwebenginewidgetsglobal.h> +#include <QtWebEngineCore/qtwebenginecoreglobal.h> #include <QtWebEngineCore/qwebenginescript.h> - #include <QtCore/qscopedpointer.h> #include <QtCore/qlist.h> #include <QtCore/qset.h> @@ -50,7 +49,7 @@ QT_BEGIN_NAMESPACE class QWebEngineScriptCollectionPrivate; -class QWEBENGINEWIDGETS_EXPORT QWebEngineScriptCollection { +class Q_WEBENGINECORE_EXPORT QWebEngineScriptCollection { public: ~QWebEngineScriptCollection(); bool isEmpty() const { return !count(); } diff --git a/src/webenginewidgets/api/qwebenginescriptcollection_p.h b/src/core/api/qwebenginescriptcollection_p.h index 322ade3b6..fe71b6bc3 100644 --- a/src/webenginewidgets/api/qwebenginescriptcollection_p.h +++ b/src/core/api/qwebenginescriptcollection_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtWebEngine module of the Qt Toolkit. @@ -51,8 +51,7 @@ // We mean it. // -#include "qtwebenginewidgetsglobal.h" - +#include "qtwebenginecoreglobal.h" #include "qwebenginescript.h" #include "web_contents_adapter.h" @@ -64,7 +63,7 @@ class UserResourceControllerHost; } // namespace QT_BEGIN_NAMESPACE -class QWebEngineScriptCollectionPrivate { +class Q_WEBENGINECORE_PRIVATE_EXPORT QWebEngineScriptCollectionPrivate { public: QWebEngineScriptCollectionPrivate(QtWebEngineCore::UserResourceControllerHost *, QSharedPointer<QtWebEngineCore::WebContentsAdapter> = QSharedPointer<QtWebEngineCore::WebContentsAdapter>()); diff --git a/src/webenginewidgets/webenginewidgets.pro b/src/webenginewidgets/webenginewidgets.pro index cd575d45d..1b054805b 100644 --- a/src/webenginewidgets/webenginewidgets.pro +++ b/src/webenginewidgets/webenginewidgets.pro @@ -18,7 +18,6 @@ SOURCES = \ api/qwebenginenotificationpresenter.cpp \ api/qwebenginepage.cpp \ api/qwebengineprofile.cpp \ - api/qwebenginescriptcollection.cpp \ api/qwebengineview.cpp \ render_widget_host_view_qt_delegate_widget.cpp @@ -31,8 +30,6 @@ HEADERS = \ api/qwebenginepage_p.h \ api/qwebengineprofile.h \ api/qwebengineprofile_p.h \ - api/qwebenginescriptcollection.h \ - api/qwebenginescriptcollection_p.h \ api/qwebengineview.h \ api/qwebengineview_p.h \ render_widget_host_view_qt_delegate_widget.h |