diff options
Diffstat (limited to 'src/webengine')
22 files changed, 84 insertions, 40 deletions
diff --git a/src/webengine/api/qquickwebenginedownloaditem.cpp b/src/webengine/api/qquickwebenginedownloaditem.cpp index c1eaaadb1..c38f5ea1c 100644 --- a/src/webengine/api/qquickwebenginedownloaditem.cpp +++ b/src/webengine/api/qquickwebenginedownloaditem.cpp @@ -36,6 +36,9 @@ #include "qquickwebenginedownloaditem_p.h" #include "qquickwebenginedownloaditem_p_p.h" +#include "qquickwebengineprofile_p_p.h" + +using QtWebEngineCore::BrowserContextAdapterClient; QT_BEGIN_NAMESPACE diff --git a/src/webengine/api/qquickwebenginedownloaditem_p_p.h b/src/webengine/api/qquickwebenginedownloaditem_p_p.h index 9d054f5e0..fe45ca2a3 100644 --- a/src/webengine/api/qquickwebenginedownloaditem_p_p.h +++ b/src/webengine/api/qquickwebenginedownloaditem_p_p.h @@ -37,12 +37,13 @@ #ifndef QQUICKWEBENGINEDOWNLOADITEM_P_P_H #define QQUICKWEBENGINEDOWNLOADITEM_P_P_H +#include "browser_context_adapter_client.h" #include "qquickwebenginedownloaditem_p.h" -#include "qquickwebengineprofile_p_p.h" #include <private/qtwebengineglobal_p.h> #include <QString> QT_BEGIN_NAMESPACE +class QQuickWebEngineProfilePrivate; class QQuickWebEngineDownloadItemPrivate { QQuickWebEngineDownloadItem *q_ptr; @@ -59,7 +60,7 @@ public: qint64 receivedBytes; QString downloadPath; - void update(const BrowserContextAdapterClient::DownloadItemInfo &info); + void update(const QtWebEngineCore::BrowserContextAdapterClient::DownloadItemInfo &info); void updateState(QQuickWebEngineDownloadItem::DownloadState newState); }; diff --git a/src/webengine/api/qquickwebenginehistory.cpp b/src/webengine/api/qquickwebenginehistory.cpp index 3b6d7bb2f..9a737fbbe 100644 --- a/src/webengine/api/qquickwebenginehistory.cpp +++ b/src/webengine/api/qquickwebenginehistory.cpp @@ -68,7 +68,7 @@ int QQuickWebEngineHistoryListModelPrivate::offsetForIndex(int index) const return index - adapter()->currentNavigationEntryIndex(); } -WebContentsAdapter *QQuickWebEngineHistoryListModelPrivate::adapter() const +QtWebEngineCore::WebContentsAdapter *QQuickWebEngineHistoryListModelPrivate::adapter() const { return view->adapter.data(); } diff --git a/src/webengine/api/qquickwebenginehistory_p.h b/src/webengine/api/qquickwebenginehistory_p.h index 02f29b35b..cb6aff2bc 100644 --- a/src/webengine/api/qquickwebenginehistory_p.h +++ b/src/webengine/api/qquickwebenginehistory_p.h @@ -46,8 +46,6 @@ QT_BEGIN_NAMESPACE -class WebEngineHistory; -class WebEngineHistoryItem; class QQuickWebEngineHistory; class QQuickWebEngineHistoryPrivate; class QQuickWebEngineHistoryListModelPrivate; diff --git a/src/webengine/api/qquickwebenginehistory_p_p.h b/src/webengine/api/qquickwebenginehistory_p_p.h index 2ad2af26f..0d714b1b6 100644 --- a/src/webengine/api/qquickwebenginehistory_p_p.h +++ b/src/webengine/api/qquickwebenginehistory_p_p.h @@ -37,11 +37,13 @@ #ifndef QQUICKWEBENGINEHISTORY_P_P_H #define QQUICKWEBENGINEHISTORY_P_P_H +namespace QtWebEngineCore { class WebContentsAdapter; -class QQuickWebEngineHistoryListModel; -class QQuickWebEngineViewPrivate; +} QT_BEGIN_NAMESPACE +class QQuickWebEngineHistoryListModel; +class QQuickWebEngineViewPrivate; class QQuickWebEngineHistoryListModelPrivate { public: @@ -52,7 +54,7 @@ public: virtual int index(int) const; virtual int offsetForIndex(int) const; - WebContentsAdapter *adapter() const; + QtWebEngineCore::WebContentsAdapter *adapter() const; QQuickWebEngineViewPrivate *view; }; diff --git a/src/webengine/api/qquickwebenginenewviewrequest_p.h b/src/webengine/api/qquickwebenginenewviewrequest_p.h index a24ce3b79..062a2fa33 100644 --- a/src/webengine/api/qquickwebenginenewviewrequest_p.h +++ b/src/webengine/api/qquickwebenginenewviewrequest_p.h @@ -40,7 +40,9 @@ #include "qtwebengineglobal_p.h" #include "qquickwebengineview_p.h" +namespace QtWebEngineCore { class WebContentsAdapter; +} QT_BEGIN_NAMESPACE @@ -59,7 +61,7 @@ private: QQuickWebEngineNewViewRequest(); QQuickWebEngineView::NewViewDestination m_destination; bool m_isUserInitiated; - QExplicitlySharedDataPointer<WebContentsAdapter> m_adapter; + QExplicitlySharedDataPointer<QtWebEngineCore::WebContentsAdapter> m_adapter; friend class QQuickWebEngineViewPrivate; }; diff --git a/src/webengine/api/qquickwebengineprofile.cpp b/src/webengine/api/qquickwebengineprofile.cpp index 36992ca9f..718007c35 100644 --- a/src/webengine/api/qquickwebengineprofile.cpp +++ b/src/webengine/api/qquickwebengineprofile.cpp @@ -46,6 +46,8 @@ #include "browser_context_adapter.h" #include "web_engine_settings.h" +using QtWebEngineCore::BrowserContextAdapter; + QT_BEGIN_NAMESPACE QQuickWebEngineProfilePrivate::QQuickWebEngineProfilePrivate(BrowserContextAdapter* browserContext, bool ownsContext) diff --git a/src/webengine/api/qquickwebengineprofile_p.h b/src/webengine/api/qquickwebengineprofile_p.h index a18d81be4..ee91d7728 100644 --- a/src/webengine/api/qquickwebengineprofile_p.h +++ b/src/webengine/api/qquickwebengineprofile_p.h @@ -43,6 +43,10 @@ #include <QScopedPointer> #include <QString> +namespace QtWebEngineCore { +class BrowserContextAdapter; +} + QT_BEGIN_NAMESPACE class QQuickWebEngineDownloadItem; diff --git a/src/webengine/api/qquickwebengineprofile_p_p.h b/src/webengine/api/qquickwebengineprofile_p_p.h index 4810cec77..0cf11acec 100644 --- a/src/webengine/api/qquickwebengineprofile_p_p.h +++ b/src/webengine/api/qquickwebengineprofile_p_p.h @@ -37,8 +37,6 @@ #ifndef QQUICKWEBENGINEPROFILE_P_P_H #define QQUICKWEBENGINEPROFILE_P_P_H -class BrowserContextAdapter; - #include "browser_context_adapter_client.h" #include "qquickwebengineprofile_p.h" @@ -51,13 +49,13 @@ QT_BEGIN_NAMESPACE class QQuickWebEngineDownloadItem; class QQuickWebEngineSettings; -class QQuickWebEngineProfilePrivate : public BrowserContextAdapterClient { +class QQuickWebEngineProfilePrivate : public QtWebEngineCore::BrowserContextAdapterClient { public: Q_DECLARE_PUBLIC(QQuickWebEngineProfile) - QQuickWebEngineProfilePrivate(BrowserContextAdapter* browserContext, bool ownsContext); + QQuickWebEngineProfilePrivate(QtWebEngineCore::BrowserContextAdapter* browserContext, bool ownsContext); ~QQuickWebEngineProfilePrivate(); - BrowserContextAdapter *browserContext() const { return m_browserContext; } + QtWebEngineCore::BrowserContextAdapter *browserContext() const { return m_browserContext; } QQuickWebEngineSettings *settings() const { return m_settings.data(); } void cancelDownload(quint32 downloadId); @@ -70,8 +68,8 @@ private: friend class QQuickWebEngineViewPrivate; QQuickWebEngineProfile *q_ptr; QScopedPointer<QQuickWebEngineSettings> m_settings; - BrowserContextAdapter *m_browserContext; - QExplicitlySharedDataPointer<BrowserContextAdapter> m_browserContextRef; + QtWebEngineCore::BrowserContextAdapter *m_browserContext; + QExplicitlySharedDataPointer<QtWebEngineCore::BrowserContextAdapter> m_browserContextRef; QMap<quint32, QPointer<QQuickWebEngineDownloadItem> > m_ongoingDownloads; }; diff --git a/src/webengine/api/qquickwebenginescript.cpp b/src/webengine/api/qquickwebenginescript.cpp index 872ba1533..8d42d77a3 100644 --- a/src/webengine/api/qquickwebenginescript.cpp +++ b/src/webengine/api/qquickwebenginescript.cpp @@ -41,6 +41,8 @@ #include <QtCore/QTimerEvent> #include "user_script_controller_host.h" +using QtWebEngineCore::UserScript; + QQuickWebEngineScript::QQuickWebEngineScript() : d_ptr(new QQuickWebEngineScriptPrivate) { @@ -178,7 +180,7 @@ void QQuickWebEngineScript::timerEvent(QTimerEvent *e) d->m_controllerHost->addUserScript(d->coreScript, d->m_adapter); } -void QQuickWebEngineScriptPrivate::bind(UserScriptControllerHost *scriptController, WebContentsAdapter *adapter) +void QQuickWebEngineScriptPrivate::bind(QtWebEngineCore::UserScriptControllerHost *scriptController, QtWebEngineCore::WebContentsAdapter *adapter) { aboutToUpdateUnderlyingScript(); m_adapter = adapter; diff --git a/src/webengine/api/qquickwebenginescript_p.h b/src/webengine/api/qquickwebenginescript_p.h index a42aed41b..4992105fa 100644 --- a/src/webengine/api/qquickwebenginescript_p.h +++ b/src/webengine/api/qquickwebenginescript_p.h @@ -40,9 +40,6 @@ #include <private/qtwebengineglobal_p.h> #include <QtCore/QObject> -class UserScriptControllerHost; -class WebContentsAdapter; - QT_BEGIN_NAMESPACE class QQuickWebEngineScriptPrivate; class QQuickWebEngineView; @@ -101,7 +98,7 @@ protected: private: friend class QQuickWebEngineViewPrivate; - Q_DECLARE_PRIVATE(QQuickWebEngineScript); + Q_DECLARE_PRIVATE(QQuickWebEngineScript) QScopedPointer<QQuickWebEngineScriptPrivate> d_ptr; }; QT_END_NAMESPACE diff --git a/src/webengine/api/qquickwebenginescript_p_p.h b/src/webengine/api/qquickwebenginescript_p_p.h index 962a04cb2..7b5626fd1 100644 --- a/src/webengine/api/qquickwebenginescript_p_p.h +++ b/src/webengine/api/qquickwebenginescript_p_p.h @@ -43,6 +43,10 @@ #include "user_script.h" #include "web_contents_adapter.h" +namespace QtWebEngineCore { +class UserScriptControllerHost; +class WebContentsAdapter; +} // namespace QT_BEGIN_NAMESPACE @@ -51,12 +55,12 @@ public: Q_DECLARE_PUBLIC(QQuickWebEngineScript) QQuickWebEngineScriptPrivate(); void aboutToUpdateUnderlyingScript(); - void bind(UserScriptControllerHost *, WebContentsAdapter * = 0); + void bind(QtWebEngineCore::UserScriptControllerHost *, QtWebEngineCore::WebContentsAdapter * = 0); - UserScript coreScript; + QtWebEngineCore::UserScript coreScript; QBasicTimer m_basicTimer; - UserScriptControllerHost *m_controllerHost; - WebContentsAdapter *m_adapter; + QtWebEngineCore::UserScriptControllerHost *m_controllerHost; + QtWebEngineCore::WebContentsAdapter *m_adapter; private: QQuickWebEngineScript *q_ptr; diff --git a/src/webengine/api/qquickwebenginesettings.cpp b/src/webengine/api/qquickwebenginesettings.cpp index 343ffef0e..70a9d4b59 100644 --- a/src/webengine/api/qquickwebenginesettings.cpp +++ b/src/webengine/api/qquickwebenginesettings.cpp @@ -43,6 +43,8 @@ QT_BEGIN_NAMESPACE +using QtWebEngineCore::WebEngineSettings; + QQuickWebEngineSettings::QQuickWebEngineSettings(QQuickWebEngineSettings *parentSettings) : d_ptr(new WebEngineSettings(parentSettings ? parentSettings->d_ptr.data() : 0)) { } diff --git a/src/webengine/api/qquickwebenginesettings_p.h b/src/webengine/api/qquickwebenginesettings_p.h index 40d04fdf8..68c85ea7f 100644 --- a/src/webengine/api/qquickwebenginesettings_p.h +++ b/src/webengine/api/qquickwebenginesettings_p.h @@ -41,7 +41,9 @@ #include <QObject> #include <QScopedPointer> +namespace QtWebEngineCore { class WebEngineSettings; +} QT_BEGIN_NAMESPACE @@ -111,7 +113,7 @@ private: void setParentSettings(QQuickWebEngineSettings *parentSettings); - QScopedPointer<WebEngineSettings> d_ptr; + QScopedPointer<QtWebEngineCore::WebEngineSettings> d_ptr; }; QT_END_NAMESPACE diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index 13eb63e07..1430d72b3 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -72,6 +72,7 @@ #endif // QT_NO_ACCESSIBILITY QT_BEGIN_NAMESPACE +using namespace QtWebEngineCore; #ifndef QT_NO_ACCESSIBILITY static QAccessibleInterface *webAccessibleFactory(const QString &, QObject *object) diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h index faf567d3a..0111d4be4 100644 --- a/src/webengine/api/qquickwebengineview_p_p.h +++ b/src/webengine/api/qquickwebengineview_p_p.h @@ -46,8 +46,10 @@ #include <QtCore/qcompilerdetection.h> #include <QtGui/qaccessibleobject.h> +namespace QtWebEngineCore { class WebContentsAdapter; class UIDelegatesManager; +} QT_BEGIN_NAMESPACE class QQuickWebEngineView; @@ -121,7 +123,7 @@ private: Q_DECLARE_PUBLIC(QQuickWebEngineView) }; -class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineViewPrivate : public WebContentsAdapterClient +class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineViewPrivate : public QtWebEngineCore::WebContentsAdapterClient { public: Q_DECLARE_PUBLIC(QQuickWebEngineView) @@ -131,10 +133,10 @@ public: QQuickWebEngineViewExperimental *experimental() const; QQuickWebEngineViewport *viewport() const; - UIDelegatesManager *ui(); + QtWebEngineCore::UIDelegatesManager *ui(); - virtual RenderWidgetHostViewQtDelegate* CreateRenderWidgetHostViewQtDelegate(RenderWidgetHostViewQtDelegateClient *client) Q_DECL_OVERRIDE; - virtual RenderWidgetHostViewQtDelegate* CreateRenderWidgetHostViewQtDelegateForPopup(RenderWidgetHostViewQtDelegateClient *client) Q_DECL_OVERRIDE; + virtual QtWebEngineCore::RenderWidgetHostViewQtDelegate* CreateRenderWidgetHostViewQtDelegate(QtWebEngineCore::RenderWidgetHostViewQtDelegateClient *client) Q_DECL_OVERRIDE; + virtual QtWebEngineCore::RenderWidgetHostViewQtDelegate* CreateRenderWidgetHostViewQtDelegateForPopup(QtWebEngineCore::RenderWidgetHostViewQtDelegateClient *client) Q_DECL_OVERRIDE; virtual void titleChanged(const QString&) Q_DECL_OVERRIDE; virtual void urlChanged(const QUrl&) Q_DECL_OVERRIDE; virtual void iconChanged(const QUrl&) Q_DECL_OVERRIDE; @@ -149,13 +151,13 @@ public: virtual void loadFinished(bool success, const QUrl &url, int errorCode = 0, const QString &errorDescription = QString()) Q_DECL_OVERRIDE; virtual void focusContainer() Q_DECL_OVERRIDE; virtual void unhandledKeyEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - virtual void adoptNewWindow(WebContentsAdapter *newWebContents, WindowOpenDisposition disposition, bool userGesture, const QRect &) Q_DECL_OVERRIDE; + virtual void adoptNewWindow(QtWebEngineCore::WebContentsAdapter *newWebContents, WindowOpenDisposition disposition, bool userGesture, const QRect &) Q_DECL_OVERRIDE; virtual void close() Q_DECL_OVERRIDE; virtual void requestFullScreen(bool) Q_DECL_OVERRIDE; virtual bool isFullScreen() const Q_DECL_OVERRIDE; - virtual bool contextMenuRequested(const WebEngineContextMenuData &) Q_DECL_OVERRIDE; + virtual bool contextMenuRequested(const QtWebEngineCore::WebEngineContextMenuData &) Q_DECL_OVERRIDE; virtual void navigationRequested(int navigationType, const QUrl &url, int &navigationRequestAction, bool isMainFrame) Q_DECL_OVERRIDE; - virtual void javascriptDialog(QSharedPointer<JavaScriptDialogController>) Q_DECL_OVERRIDE; + virtual void javascriptDialog(QSharedPointer<QtWebEngineCore::JavaScriptDialogController>) Q_DECL_OVERRIDE; virtual void runFileChooser(FileChooserMode, const QString &defaultFileName, const QStringList &acceptedMimeTypes) Q_DECL_OVERRIDE; virtual void didRunJavaScript(quint64, const QVariant&) Q_DECL_OVERRIDE; virtual void didFetchDocumentMarkup(quint64, const QString&) Q_DECL_OVERRIDE { } @@ -169,14 +171,14 @@ public: #ifndef QT_NO_ACCESSIBILITY virtual QObject *accessibilityParentObject() Q_DECL_OVERRIDE; #endif // QT_NO_ACCESSIBILITY - virtual WebEngineSettings *webEngineSettings() const Q_DECL_OVERRIDE; + virtual QtWebEngineCore::WebEngineSettings *webEngineSettings() const Q_DECL_OVERRIDE; virtual void allowCertificateError(const QSharedPointer<CertificateErrorController> &errorController); virtual void runGeolocationPermissionRequest(QUrl const&) Q_DECL_OVERRIDE; - virtual BrowserContextAdapter *browserContextAdapter() Q_DECL_OVERRIDE; + virtual QtWebEngineCore::BrowserContextAdapter *browserContextAdapter() Q_DECL_OVERRIDE; void setDevicePixelRatio(qreal); - void adoptWebContents(WebContentsAdapter *webContents); + void adoptWebContents(QtWebEngineCore::WebContentsAdapter *webContents); void setProfile(QQuickWebEngineProfile *profile); void ensureContentsAdapter(); @@ -186,7 +188,7 @@ public: static QQuickWebEngineScript *userScripts_at(QQmlListProperty<QQuickWebEngineScript> *p, int idx); static void userScripts_clear(QQmlListProperty<QQuickWebEngineScript> *p); - QExplicitlySharedDataPointer<WebContentsAdapter> adapter; + QExplicitlySharedDataPointer<QtWebEngineCore::WebContentsAdapter> adapter; QScopedPointer<QQuickWebEngineViewExperimental> e; QScopedPointer<QQuickWebEngineViewport> v; QScopedPointer<QQuickWebEngineHistory> m_history; @@ -203,7 +205,7 @@ public: QSharedPointer<CertificateErrorController> m_certificateErrorController; private: - QScopedPointer<UIDelegatesManager> m_uIDelegatesManager; + QScopedPointer<QtWebEngineCore::UIDelegatesManager> m_uIDelegatesManager; QList<QQuickWebEngineScript *> m_userScripts; qreal m_dpiScale; }; diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp index bfcda558b..0a534ac2c 100644 --- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp +++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp @@ -46,6 +46,8 @@ #include <private/qquickwindow_p.h> #include <private/qsgcontext_p.h> +namespace QtWebEngineCore { + RenderWidgetHostViewQtDelegateQuick::RenderWidgetHostViewQtDelegateQuick(RenderWidgetHostViewQtDelegateClient *client, bool isPopup) : m_client(client) , m_isPopup(isPopup) @@ -273,3 +275,5 @@ void RenderWidgetHostViewQtDelegateQuick::onWindowPosChanged() { m_client->windowBoundsChanged(); } + +} // namespace QtWebEngineCore diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.h b/src/webengine/render_widget_host_view_qt_delegate_quick.h index cb1b6a83f..ddd0e4d9e 100644 --- a/src/webengine/render_widget_host_view_qt_delegate_quick.h +++ b/src/webengine/render_widget_host_view_qt_delegate_quick.h @@ -41,6 +41,8 @@ #include <QQuickItem> +namespace QtWebEngineCore { + class RenderWidgetHostViewQtDelegateQuick : public QQuickItem, public RenderWidgetHostViewQtDelegate { Q_OBJECT @@ -95,4 +97,7 @@ private: bool m_isPopup; bool m_initialized; }; + +} // namespace QtWebEngineCore + #endif diff --git a/src/webengine/render_widget_host_view_qt_delegate_quickwindow.cpp b/src/webengine/render_widget_host_view_qt_delegate_quickwindow.cpp index c395fdd4d..39c48ea5c 100644 --- a/src/webengine/render_widget_host_view_qt_delegate_quickwindow.cpp +++ b/src/webengine/render_widget_host_view_qt_delegate_quickwindow.cpp @@ -39,6 +39,7 @@ #include "qquickwebengineview_p_p.h" #include <QQuickItem> +namespace QtWebEngineCore { RenderWidgetHostViewQtDelegateQuickWindow::RenderWidgetHostViewQtDelegateQuickWindow(RenderWidgetHostViewQtDelegate *realDelegate) : m_realDelegate(realDelegate) @@ -136,3 +137,5 @@ void RenderWidgetHostViewQtDelegateQuickWindow::setTooltip(const QString &toolti { Q_UNUSED(tooltip); } + +} // namespace QtWebEngineCore diff --git a/src/webengine/render_widget_host_view_qt_delegate_quickwindow.h b/src/webengine/render_widget_host_view_qt_delegate_quickwindow.h index 6bd21d15a..cda51a1ab 100644 --- a/src/webengine/render_widget_host_view_qt_delegate_quickwindow.h +++ b/src/webengine/render_widget_host_view_qt_delegate_quickwindow.h @@ -44,6 +44,8 @@ #include <QQuickWindow> #include <QScopedPointer> +namespace QtWebEngineCore { + class RenderWidgetHostViewQtDelegateQuickWindow : public QQuickWindow , public RenderWidgetHostViewQtDelegate { public: @@ -76,4 +78,6 @@ private: QScopedPointer<RenderWidgetHostViewQtDelegate> m_realDelegate; }; +} // namespace QtWebEngineCore + #endif // RENDER_WIDGET_HOST_VIEW_QT_DELEGATE_QUICKWINDOW_H diff --git a/src/webengine/ui_delegates_manager.cpp b/src/webengine/ui_delegates_manager.cpp index 23816caff..615c6024d 100644 --- a/src/webengine/ui_delegates_manager.cpp +++ b/src/webengine/ui_delegates_manager.cpp @@ -51,6 +51,8 @@ // Uncomment for QML debugging //#define UI_DELEGATES_DEBUG +namespace QtWebEngineCore { + #define NO_SEPARATOR #if defined(Q_OS_WIN) #define FILE_NAME_CASE_STATEMENT(TYPE, COMPONENT) \ @@ -428,4 +430,6 @@ void UIDelegatesManager::showFilePicker(WebContentsAdapterClient::FileChooserMod QMetaObject::invokeMethod(filePicker, "open"); } +} // namespace QtWebEngineCore + #include "ui_delegates_manager.moc" diff --git a/src/webengine/ui_delegates_manager.h b/src/webengine/ui_delegates_manager.h index e0eeb4679..b43006381 100644 --- a/src/webengine/ui_delegates_manager.h +++ b/src/webengine/ui_delegates_manager.h @@ -63,13 +63,15 @@ #define MEMBER_DECLARATION(TYPE, COMPONENT) \ QQmlComponent *COMPONENT##Component -class JavaScriptDialogController; QT_BEGIN_NAMESPACE class QObject; class QQmlContext; class QQuickWebEngineView; QT_END_NAMESPACE +namespace QtWebEngineCore { +class JavaScriptDialogController; + const char *defaultPropertyName(QObject *obj); class MenuItemHandler : public QObject { @@ -130,8 +132,10 @@ private: FOR_EACH_COMPONENT_TYPE(MEMBER_DECLARATION, SEMICOLON_SEPARATOR) - Q_DISABLE_COPY(UIDelegatesManager); + Q_DISABLE_COPY(UIDelegatesManager) }; +} // namespace QtWebEngineCore + #endif // UI_DELEGATES_MANAGER_H |