summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2020-08-21 15:19:55 +0200
committerMichal Klocek <michal.klocek@qt.io>2020-09-02 17:41:20 +0200
commitc4a4a38062ba04b0986f53a0e307c60cf97e6fb8 (patch)
treeeceaaeecf2fda5eca72eb1d472e5fadf757729b6 /src
parent0870cc93ad3240f5898f231c8f8b8fd82035206d (diff)
Move qwebenginesettings to core
Just moves qwebenginesettings to core. [ChangeLog] QWebEngineSettings is moved to QtWebEngieCore Change-Id: I7f623bce98213669a4b844f3377aa13e7f3dbd96 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/core/api/core_api.pro6
-rw-r--r--src/core/api/qwebenginesettings.cpp (renamed from src/webenginewidgets/api/qwebenginesettings.cpp)0
-rw-r--r--src/core/api/qwebenginesettings.h (renamed from src/webenginewidgets/api/qwebenginesettings.h)4
-rw-r--r--src/core/doc/src/qwebenginesettings_lgpl.qdoc (renamed from src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc)2
-rw-r--r--src/webenginewidgets/webenginewidgets.pro2
5 files changed, 7 insertions, 7 deletions
diff --git a/src/core/api/core_api.pro b/src/core/api/core_api.pro
index 885b81f70..e1a716955 100644
--- a/src/core/api/core_api.pro
+++ b/src/core/api/core_api.pro
@@ -54,7 +54,8 @@ HEADERS = \
qwebenginecontextmenurequest.h \
qwebenginecontextmenurequest_p.h \
qwebenginedownloadrequest.h \
- qwebenginedownloadrequest_p.h
+ qwebenginedownloadrequest_p.h \
+ qwebenginesettings.h
SOURCES = \
qtwebenginecoreglobal.cpp \
@@ -72,7 +73,8 @@ SOURCES = \
qwebengineurlscheme.cpp \
qwebengineurlschemehandler.cpp \
qwebenginecontextmenurequest.cpp \
- qwebenginedownloadrequest.cpp
+ qwebenginedownloadrequest.cpp \
+ qwebenginesettings.cpp
# Chromium headers included are not remotely clean
CONFIG -= warning_clean
diff --git a/src/webenginewidgets/api/qwebenginesettings.cpp b/src/core/api/qwebenginesettings.cpp
index f405921a6..f405921a6 100644
--- a/src/webenginewidgets/api/qwebenginesettings.cpp
+++ b/src/core/api/qwebenginesettings.cpp
diff --git a/src/webenginewidgets/api/qwebenginesettings.h b/src/core/api/qwebenginesettings.h
index 5cc40723e..3b98c0fd7 100644
--- a/src/webenginewidgets/api/qwebenginesettings.h
+++ b/src/core/api/qwebenginesettings.h
@@ -40,7 +40,7 @@
#ifndef QWEBENGINESETTINGS_H
#define QWEBENGINESETTINGS_H
-#include <QtWebEngineWidgets/qtwebenginewidgetsglobal.h>
+#include <QtWebEngineCore/qtwebenginecoreglobal.h>
#include <QtCore/qscopedpointer.h>
#include <QtCore/qstring.h>
@@ -54,7 +54,7 @@ class QIcon;
class QPixmap;
class QUrl;
-class QWEBENGINEWIDGETS_EXPORT QWebEngineSettings {
+class Q_WEBENGINECORE_EXPORT QWebEngineSettings {
public:
enum FontFamily {
StandardFont,
diff --git a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc b/src/core/doc/src/qwebenginesettings_lgpl.qdoc
index e904b65ba..a62abfbab 100644
--- a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc
+++ b/src/core/doc/src/qwebenginesettings_lgpl.qdoc
@@ -28,7 +28,7 @@
\brief The QWebEngineSettings class provides an object to store the settings used
by QWebEnginePage.
- \inmodule QtWebEngineWidgets
+ \inmodule QtWebEngineCore
QWebEngineSettings allows configuration of browser properties, such as font sizes and
families, the location of a custom style sheet, and generic attributes, such as JavaScript
diff --git a/src/webenginewidgets/webenginewidgets.pro b/src/webenginewidgets/webenginewidgets.pro
index 697f97493..23f51f922 100644
--- a/src/webenginewidgets/webenginewidgets.pro
+++ b/src/webenginewidgets/webenginewidgets.pro
@@ -21,7 +21,6 @@ SOURCES = \
api/qwebengineprofile.cpp \
api/qwebenginescript.cpp \
api/qwebenginescriptcollection.cpp \
- api/qwebenginesettings.cpp \
api/qwebengineview.cpp \
render_widget_host_view_qt_delegate_widget.cpp
@@ -37,7 +36,6 @@ HEADERS = \
api/qwebengineprofile_p.h \
api/qwebenginescriptcollection.h \
api/qwebenginescriptcollection_p.h \
- api/qwebenginesettings.h \
api/qwebengineview.h \
api/qwebengineview_p.h \
render_widget_host_view_qt_delegate_widget.h