From 1bf41b83e3ee388ef43504a09b7ae5e700606e17 Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Thu, 3 Sep 2020 11:01:47 +0100 Subject: Fix build with latest QtBase and QtDeclarative Task-number: QTBUG-86410 Change-Id: I26427d65de72c86f952b076259979f90eaef87f4 Reviewed-by: Sean Harmer --- src/animation/backend/functionrangefinder_p.h | 2 +- src/core/qscheduler.cpp | 3 +++ src/plugins/renderers/rhi/io/rhibuffer_p.h | 4 ++-- tests/manual/rendercapture-qml-fbo/rendercaptureprovider.h | 4 ++-- tests/manual/rendercapture-qml/rendercaptureprovider.h | 4 ++-- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/animation/backend/functionrangefinder_p.h b/src/animation/backend/functionrangefinder_p.h index 5df05bea4..004bea4b8 100644 --- a/src/animation/backend/functionrangefinder_p.h +++ b/src/animation/backend/functionrangefinder_p.h @@ -81,7 +81,7 @@ private: int locate(float x) const; int hunt(float x) const; - const QList &m_x; + QList m_x; mutable int m_previousLowerBound; mutable bool m_correlated; int m_rangeSize; diff --git a/src/core/qscheduler.cpp b/src/core/qscheduler.cpp index a18a0b144..c982e39ca 100644 --- a/src/core/qscheduler.cpp +++ b/src/core/qscheduler.cpp @@ -128,6 +128,9 @@ int QScheduler::scheduleAndWaitForFrameAspectJobs(qint64 time, bool dumpJobs) std::make_move_iterator(aspectJobs.end())); } + if (jobQueue.empty()) + return 0; + if (dumpJobs) ::dumpJobs(jobQueue); diff --git a/src/plugins/renderers/rhi/io/rhibuffer_p.h b/src/plugins/renderers/rhi/io/rhibuffer_p.h index 7d4a3c54f..52023332b 100644 --- a/src/plugins/renderers/rhi/io/rhibuffer_p.h +++ b/src/plugins/renderers/rhi/io/rhibuffer_p.h @@ -87,7 +87,7 @@ public: QByteArray download(SubmissionContext *ctx, uint size); void cleanup(); - int size() const { return m_allocSize; } + qsizetype size() const { return m_allocSize; } QRhiBuffer *rhiBuffer() const noexcept { return m_rhiBuffer; } private: @@ -95,7 +95,7 @@ private: uint m_bufferId; bool m_dynamic; - int m_allocSize {}; + qsizetype m_allocSize {}; QRhiBuffer *m_rhiBuffer {}; diff --git a/tests/manual/rendercapture-qml-fbo/rendercaptureprovider.h b/tests/manual/rendercapture-qml-fbo/rendercaptureprovider.h index bc0f54963..4fe2416cf 100644 --- a/tests/manual/rendercapture-qml-fbo/rendercaptureprovider.h +++ b/tests/manual/rendercapture-qml-fbo/rendercaptureprovider.h @@ -54,12 +54,12 @@ #include #include -class RenderCaptureProvider : public QObject, public QQuickImageProvider +class RenderCaptureProvider : public QQuickImageProvider { Q_OBJECT public: RenderCaptureProvider() - : QObject(), QQuickImageProvider(Image) + : QQuickImageProvider(Image) { m_image = QImage(10,10, QImage::Format_ARGB32); m_image.fill(QColor("blue").rgba()); diff --git a/tests/manual/rendercapture-qml/rendercaptureprovider.h b/tests/manual/rendercapture-qml/rendercaptureprovider.h index bc0f54963..4fe2416cf 100644 --- a/tests/manual/rendercapture-qml/rendercaptureprovider.h +++ b/tests/manual/rendercapture-qml/rendercaptureprovider.h @@ -54,12 +54,12 @@ #include #include -class RenderCaptureProvider : public QObject, public QQuickImageProvider +class RenderCaptureProvider : public QQuickImageProvider { Q_OBJECT public: RenderCaptureProvider() - : QObject(), QQuickImageProvider(Image) + : QQuickImageProvider(Image) { m_image = QImage(10,10, QImage::Format_ARGB32); m_image.fill(QColor("blue").rgba()); -- cgit v1.2.3