diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-04-20 16:18:59 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-04-24 20:04:04 +0200 |
commit | d0852f90a24673ccc9ef0b93e224ba37b674644d (patch) | |
tree | 99f70cf22c1e671be5bddd46be25439d34e805d5 /src/webengine/api | |
parent | dbc3ca7cfcb915b99bb43ddb13959c90a264fa11 (diff) |
Fix building dev with newer QtBase
Change-Id: I0d52e4f6684425cb15319760e0001bdb13846997
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'src/webengine/api')
-rw-r--r-- | src/webengine/api/qquickwebenginedownloaditem_p.h | 4 | ||||
-rw-r--r-- | src/webengine/api/qquickwebenginesingleton_p.h | 5 | ||||
-rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 1 | ||||
-rw-r--r-- | src/webengine/api/qquickwebengineview_p.h | 5 |
4 files changed, 11 insertions, 4 deletions
diff --git a/src/webengine/api/qquickwebenginedownloaditem_p.h b/src/webengine/api/qquickwebenginedownloaditem_p.h index e1b1b9040..38293cd30 100644 --- a/src/webengine/api/qquickwebenginedownloaditem_p.h +++ b/src/webengine/api/qquickwebenginedownloaditem_p.h @@ -52,16 +52,18 @@ // #include <QtWebEngine/private/qtwebengineglobal_p.h> + #include <QObject> #include <QScopedPointer> #include <QString> #include <QUrl> +#include "qquickwebengineview_p.h" + QT_BEGIN_NAMESPACE class QQuickWebEngineDownloadItemPrivate; class QQuickWebEngineProfilePrivate; -class QQuickWebEngineView; class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineDownloadItem: public QObject { Q_OBJECT diff --git a/src/webengine/api/qquickwebenginesingleton_p.h b/src/webengine/api/qquickwebenginesingleton_p.h index ba63382e5..5edf95303 100644 --- a/src/webengine/api/qquickwebenginesingleton_p.h +++ b/src/webengine/api/qquickwebenginesingleton_p.h @@ -52,11 +52,12 @@ // #include <QtWebEngine/private/qtwebengineglobal_p.h> + +#include <QtWebEngine/qquickwebengineprofile.h> +#include <QtWebEngine/private/qquickwebenginesettings_p.h> #include <QObject> QT_BEGIN_NAMESPACE -class QQuickWebEngineProfile; -class QQuickWebEngineSettings; class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineSingleton : public QObject { Q_OBJECT Q_PROPERTY(QQuickWebEngineSettings* settings READ settings CONSTANT FINAL) diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index bcbf95569..238ad25b2 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -2476,3 +2476,4 @@ void QQuickWebEngineTouchHandle::setOpacity(float opacity) QT_END_NAMESPACE +#include "moc_qquickwebengineview_p.cpp" diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h index ab84b2600..b0203cfa8 100644 --- a/src/webengine/api/qquickwebengineview_p.h +++ b/src/webengine/api/qquickwebengineview_p.h @@ -51,10 +51,12 @@ // We mean it. // +#include <QtWebEngineCore/qtwebenginecoreglobal.h> #include <QtWebEngine/private/qtwebengineglobal_p.h> #include <QQuickItem> #include <QtGui/qcolor.h> +#include "qquickwebengineprofile.h" #include "qquickwebenginescript.h" QT_BEGIN_NAMESPACE @@ -74,7 +76,6 @@ class QQuickWebEngineJavaScriptDialogRequest; class QQuickWebEngineLoadRequest; class QQuickWebEngineNavigationRequest; class QQuickWebEngineNewViewRequest; -class QQuickWebEngineProfile; class QQuickWebEngineSettings; class QQuickWebEngineTooltipRequest; class QQuickWebEngineFormValidationMessageRequest; @@ -123,7 +124,9 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineView : public QQuickItem { Q_PROPERTY(QQuickWebEngineProfile *profile READ profile WRITE setProfile NOTIFY profileChanged FINAL REVISION 1) Q_PROPERTY(QQuickWebEngineSettings *settings READ settings REVISION 1 CONSTANT FINAL) Q_PROPERTY(QQuickWebEngineHistory *navigationHistory READ navigationHistory CONSTANT FINAL REVISION 1) +#if QT_CONFIG(webengine_webchannel) Q_PROPERTY(QQmlWebChannel *webChannel READ webChannel WRITE setWebChannel NOTIFY webChannelChanged REVISION 1 FINAL) +#endif Q_PROPERTY(QQmlListProperty<QQuickWebEngineScript> userScripts READ userScripts FINAL REVISION 1) Q_PROPERTY(bool activeFocusOnPress READ activeFocusOnPress WRITE setActiveFocusOnPress NOTIFY activeFocusOnPressChanged REVISION 2 FINAL) Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor NOTIFY backgroundColorChanged REVISION 2 FINAL) |