summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2020-08-24 14:10:14 +0200
committerMichal Klocek <michal.klocek@qt.io>2020-09-22 11:05:44 +0200
commit98702f186c66a6eedb90b5d4823c53afd8794770 (patch)
tree14da3bc0799d97a47bc1522209b6ad363a4b7af1
parentcfda1a04cb7a0b389fc067fe2cccdbde93ebde27 (diff)
Move to qwebenginescript to core
Just a move of qwebenginescript from widgets to core. [ChangleLog] QWebEngineScirpt is now in QtWebEngineCore Change-Id: I45380377579283e27c86bb05981b227559b9630b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--src/core/api/core_api.pro6
-rw-r--r--src/core/api/qwebenginescript.cpp (renamed from src/webenginewidgets/api/qwebenginescript.cpp)2
-rw-r--r--src/core/api/qwebenginescript.h (renamed from src/webenginewidgets/api/qwebenginescript.h)6
-rw-r--r--src/webenginewidgets/api/qwebenginescriptcollection.h2
-rw-r--r--src/webenginewidgets/webenginewidgets.pro1
5 files changed, 9 insertions, 8 deletions
diff --git a/src/core/api/core_api.pro b/src/core/api/core_api.pro
index 29738520d..33b54a341 100644
--- a/src/core/api/core_api.pro
+++ b/src/core/api/core_api.pro
@@ -56,7 +56,8 @@ HEADERS = \
qwebenginecontextmenurequest_p.h \
qwebenginedownloadrequest.h \
qwebenginedownloadrequest_p.h \
- qwebenginesettings.h
+ qwebenginesettings.h \
+ qwebenginescript.h
SOURCES = \
qtwebenginecoreglobal.cpp \
@@ -76,7 +77,8 @@ SOURCES = \
qwebengineurlschemehandler.cpp \
qwebenginecontextmenurequest.cpp \
qwebenginedownloadrequest.cpp \
- qwebenginesettings.cpp
+ qwebenginesettings.cpp \
+ qwebenginescript.cpp
# Chromium headers included are not remotely clean
CONFIG -= warning_clean
diff --git a/src/webenginewidgets/api/qwebenginescript.cpp b/src/core/api/qwebenginescript.cpp
index af6b9aa8d..e56017166 100644
--- a/src/webenginewidgets/api/qwebenginescript.cpp
+++ b/src/core/api/qwebenginescript.cpp
@@ -46,7 +46,7 @@ using QtWebEngineCore::UserScript;
/*!
\class QWebEngineScript
- \inmodule QtWebEngineWidgets
+ \inmodule QtWebEngineCore
\since 5.5
\brief The QWebEngineScript class encapsulates a JavaScript program.
diff --git a/src/webenginewidgets/api/qwebenginescript.h b/src/core/api/qwebenginescript.h
index e3f65ec59..628e24ed5 100644
--- a/src/webenginewidgets/api/qwebenginescript.h
+++ b/src/core/api/qwebenginescript.h
@@ -40,7 +40,7 @@
#ifndef QWEBENGINESCRIPT_H
#define QWEBENGINESCRIPT_H
-#include <QtWebEngineWidgets/qtwebenginewidgetsglobal.h>
+#include <QtWebEngineCore/qtwebenginecoreglobal.h>
#include <QtCore/qshareddata.h>
#include <QtCore/qstring.h>
@@ -51,7 +51,7 @@ class UserScript;
QT_BEGIN_NAMESPACE
-class QWEBENGINEWIDGETS_EXPORT QWebEngineScript {
+class Q_WEBENGINECORE_EXPORT QWebEngineScript {
public:
enum InjectionPoint {
Deferred,
@@ -105,7 +105,7 @@ private:
Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QWebEngineScript)
#ifndef QT_NO_DEBUG_STREAM
-QWEBENGINEWIDGETS_EXPORT QDebug operator<<(QDebug, const QWebEngineScript &);
+Q_WEBENGINECORE_EXPORT QDebug operator<<(QDebug, const QWebEngineScript &);
#endif
QT_END_NAMESPACE
diff --git a/src/webenginewidgets/api/qwebenginescriptcollection.h b/src/webenginewidgets/api/qwebenginescriptcollection.h
index e68dfce8f..d4fad934d 100644
--- a/src/webenginewidgets/api/qwebenginescriptcollection.h
+++ b/src/webenginewidgets/api/qwebenginescriptcollection.h
@@ -41,7 +41,7 @@
#define QWEBENGINESCRIPTCOLLECTION_H
#include <QtWebEngineWidgets/qtwebenginewidgetsglobal.h>
-#include <QtWebEngineWidgets/qwebenginescript.h>
+#include <QtWebEngineCore/qwebenginescript.h>
#include <QtCore/qscopedpointer.h>
#include <QtCore/qlist.h>
diff --git a/src/webenginewidgets/webenginewidgets.pro b/src/webenginewidgets/webenginewidgets.pro
index 4112a2cb5..cd575d45d 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/qwebenginescript.cpp \
api/qwebenginescriptcollection.cpp \
api/qwebengineview.cpp \
render_widget_host_view_qt_delegate_widget.cpp