summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--examples/pdfwidgets/pdfviewer/zoomselector.cpp6
-rw-r--r--examples/pdfwidgets/pdfviewer/zoomselector.h2
-rw-r--r--src/core/compositor/compositor.cpp2
-rw-r--r--src/pdf/api/qpdfdocument.h9
-rw-r--r--src/pdf/api/qpdfpagerenderer.h9
-rw-r--r--src/pdf/qpdfpagerenderer.cpp1
-rw-r--r--src/pdf/quick/qquickpdfselection_p.h4
-rw-r--r--src/webengine/api/qquickwebenginedownloaditem_p.h4
-rw-r--r--src/webengine/api/qquickwebenginesingleton_p.h5
-rw-r--r--src/webengine/api/qquickwebengineview.cpp1
-rw-r--r--src/webengine/api/qquickwebengineview_p.h5
-rw-r--r--src/webengine/render_widget_host_view_qt_delegate_quick.cpp1
-rw-r--r--src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp1
-rw-r--r--tests/auto/quick/publicapi/tst_publicapi.cpp2
-rw-r--r--tests/auto/quick/quick.pro2
-rw-r--r--tests/auto/widgets/origins/tst_origins.cpp2
-rw-r--r--tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp4
17 files changed, 36 insertions, 24 deletions
diff --git a/examples/pdfwidgets/pdfviewer/zoomselector.cpp b/examples/pdfwidgets/pdfviewer/zoomselector.cpp
index 0205489aa..e38140e67 100644
--- a/examples/pdfwidgets/pdfviewer/zoomselector.cpp
+++ b/examples/pdfwidgets/pdfviewer/zoomselector.cpp
@@ -57,11 +57,11 @@ ZoomSelector::ZoomSelector(QWidget *parent)
addItem(QLatin1String("200%"));
addItem(QLatin1String("400%"));
- connect(this, static_cast<void(QComboBox::*)(const QString &)>(&QComboBox::currentIndexChanged),
+ connect(this, &QComboBox::currentIndexChanged,
this, &ZoomSelector::onCurrentTextChanged);
connect(lineEdit(), &QLineEdit::editingFinished,
- this, [this](){onCurrentTextChanged(lineEdit()->text()); });
+ this, [this](){onCurrentTextChanged(0, lineEdit()->text()); });
}
void ZoomSelector::setZoomFactor(qreal zoomFactor)
@@ -74,7 +74,7 @@ void ZoomSelector::reset()
setCurrentIndex(8); // 100%
}
-void ZoomSelector::onCurrentTextChanged(const QString &text)
+void ZoomSelector::onCurrentTextChanged(int, const QString &text)
{
if (text == QLatin1String("Fit Width")) {
emit zoomModeChanged(QPdfView::FitToWidth);
diff --git a/examples/pdfwidgets/pdfviewer/zoomselector.h b/examples/pdfwidgets/pdfviewer/zoomselector.h
index c58d09970..0f27bafb4 100644
--- a/examples/pdfwidgets/pdfviewer/zoomselector.h
+++ b/examples/pdfwidgets/pdfviewer/zoomselector.h
@@ -57,7 +57,7 @@ signals:
void zoomFactorChanged(qreal zoomFactor);
private slots:
- void onCurrentTextChanged(const QString &text);
+ void onCurrentTextChanged(int, const QString &text);
};
#endif // ZOOMSELECTOR_H
diff --git a/src/core/compositor/compositor.cpp b/src/core/compositor/compositor.cpp
index 82a9f7ee4..5c51fca9a 100644
--- a/src/core/compositor/compositor.cpp
+++ b/src/core/compositor/compositor.cpp
@@ -60,7 +60,7 @@ Compositor::Compositor(content::RenderWidgetHost *host)
m_beginFrameSource =
std::make_unique<viz::DelayBasedBeginFrameSource>(
std::make_unique<viz::DelayBasedTimeSource>(m_taskRunner.get()),
- viz::BeginFrameSource::kNotRestartableId);
+ 0 /*viz::BeginFrameSource::kNotRestartableId*/);
}
Compositor::~Compositor()
diff --git a/src/pdf/api/qpdfdocument.h b/src/pdf/api/qpdfdocument.h
index 40df181f4..290a7b170 100644
--- a/src/pdf/api/qpdfdocument.h
+++ b/src/pdf/api/qpdfdocument.h
@@ -38,10 +38,11 @@
#define QPDFDOCUMENT_H
#include <QtPdf/qtpdfglobal.h>
-#include <QImage>
-#include <QObject>
-#include <QtPdf/QPdfDocumentRenderOptions>
-#include "qpdfselection.h"
+
+#include <QtCore/qobject.h>
+#include <QtGui/qimage.h>
+#include <QtPdf/qpdfdocumentrenderoptions.h>
+#include <QtPdf/qpdfselection.h>
QT_BEGIN_NAMESPACE
diff --git a/src/pdf/api/qpdfpagerenderer.h b/src/pdf/api/qpdfpagerenderer.h
index de6704480..0f8152cba 100644
--- a/src/pdf/api/qpdfpagerenderer.h
+++ b/src/pdf/api/qpdfpagerenderer.h
@@ -38,13 +38,14 @@
#define QPDFPAGERENDERER_H
#include <QtPdf/qtpdfglobal.h>
-#include <QObject>
-#include <QtPdf/QPdfDocumentRenderOptions>
-#include <QSize>
+
+#include <QtCore/qobject.h>
+#include <QtCore/qsize.h>
+#include <QtPdf/qpdfdocument.h>
+#include <QtPdf/qpdfdocumentrenderoptions.h>
QT_BEGIN_NAMESPACE
-class QPdfDocument;
class QPdfPageRendererPrivate;
class Q_PDF_EXPORT QPdfPageRenderer : public QObject
diff --git a/src/pdf/qpdfpagerenderer.cpp b/src/pdf/qpdfpagerenderer.cpp
index e90f66700..90fb0319e 100644
--- a/src/pdf/qpdfpagerenderer.cpp
+++ b/src/pdf/qpdfpagerenderer.cpp
@@ -38,7 +38,6 @@
#include <private/qobject_p.h>
#include <QMutex>
-#include <QPdfDocument>
#include <QPointer>
#include <QThread>
diff --git a/src/pdf/quick/qquickpdfselection_p.h b/src/pdf/quick/qquickpdfselection_p.h
index a0e6d1a8d..bba2a4861 100644
--- a/src/pdf/quick/qquickpdfselection_p.h
+++ b/src/pdf/quick/qquickpdfselection_p.h
@@ -53,9 +53,9 @@
#include <QVariant>
#include <QtQml/qqml.h>
-QT_BEGIN_NAMESPACE
+#include "qquickpdfdocument_p.h"
-class QQuickPdfDocument;
+QT_BEGIN_NAMESPACE
class QQuickPdfSelection : public QObject
{
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)
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 d5aae271f..cb41c8706 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
+++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
@@ -42,6 +42,7 @@
#include "qquickwebengineview_p.h"
#include "qquickwebengineview_p_p.h"
#include <QGuiApplication>
+#include <QOpenGLContext>
#include <QQuickPaintedItem>
#include <QQuickWindow>
#include <QSurfaceFormat>
diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
index fdd6d1c4f..2c7cc83d1 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
@@ -47,7 +47,6 @@
#include <QMouseEvent>
#include <QOpenGLContext>
#include <QResizeEvent>
-#include <QSGAbstractRenderer>
#include <QSGNode>
#include <QWindow>
#include <QtQuick/private/qquickwindow_p.h>
diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp
index aaca7997b..bc8f61562 100644
--- a/tests/auto/quick/publicapi/tst_publicapi.cpp
+++ b/tests/auto/quick/publicapi/tst_publicapi.cpp
@@ -771,7 +771,9 @@ static const QStringList expectedAPI = QStringList()
<< "QQuickWebEngineView.url --> QUrl"
<< "QQuickWebEngineView.urlChanged() --> void"
<< "QQuickWebEngineView.userScripts --> QQmlListProperty<QQuickWebEngineScript>"
+#if QT_CONFIG(webengine_webchannel)
<< "QQuickWebEngineView.webChannel --> QQmlWebChannel*"
+#endif
<< "QQuickWebEngineView.webChannelChanged() --> void"
<< "QQuickWebEngineView.webChannelWorld --> uint"
<< "QQuickWebEngineView.webChannelWorldChanged(uint) --> void"
diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro
index 81b62b4e7..f9d84b3b4 100644
--- a/tests/auto/quick/quick.pro
+++ b/tests/auto/quick/quick.pro
@@ -17,5 +17,7 @@ qtConfig(webengine-testsupport) {
qquickwebengineviewgraphics
}
+!qtHaveModule(quickcontrols): SUBDIRS -= qmltests
+
# QTBUG-66055
boot2qt: SUBDIRS -= inspectorserver qquickwebengineview qmltests
diff --git a/tests/auto/widgets/origins/tst_origins.cpp b/tests/auto/widgets/origins/tst_origins.cpp
index e3927f763..c4691ad74 100644
--- a/tests/auto/widgets/origins/tst_origins.cpp
+++ b/tests/auto/widgets/origins/tst_origins.cpp
@@ -41,7 +41,7 @@
#include <QtWebSockets/qwebsocketserver.h>
#include <QtWebChannel/qwebchannel.h>
#endif
-#include <QtWidgets/qaction.h>
+#include <qaction.h>
#define QSL QStringLiteral
#define QBAL QByteArrayLiteral
diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
index 5e16361c5..d5a2ecf49 100644
--- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
@@ -29,8 +29,9 @@
#include <qwebengineview.h>
#include <qwebenginepage.h>
#include <qwebenginesettings.h>
-#include <qnetworkrequest.h>
+#include <qaction.h>
#include <qdiriterator.h>
+#include <qnetworkrequest.h>
#include <qstackedlayout.h>
#include <qtemporarydir.h>
#include <QClipboard>
@@ -45,7 +46,6 @@
#include <QTcpServer>
#include <QTcpSocket>
#include <QStyle>
-#include <QtWidgets/qaction.h>
#include <QWebEngineProfile>
#include <QtCore/qregularexpression.h>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 17:02:15 +0000