diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2021-06-17 20:43:47 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-18 13:41:56 +0000 |
| commit | d84465fb099d256b65b89adf22d71b52f782237d (patch) | |
| tree | dae4dbd6c928ca403ff0fbd7ed95a7dc1a188a13 | |
| parent | 3792674306c37c08bda8b23f924c67035a718a93 (diff) | |
Don't warn "interleaved frame-sync and actual events" if DA is null
Amends 1285b67a113cd2eb4fc03ec3e4ddd4dfdbe8ae76
It might turn out that this warning is just noise in other cases too;
not sure. But it's quite normal that currentEventDeliveryAgent is null
when the once-per-frame fake hover event occurs.
Fixes: QTBUG-94576
Change-Id: Ib4eed274801b08b62403caec70d0fc3c538e4383
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
(cherry picked from commit 8a46606ee7b103100bb09d175ec296b521cf91c7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/quick/util/qquickdeliveryagent.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quick/util/qquickdeliveryagent.cpp b/src/quick/util/qquickdeliveryagent.cpp index 2b649d01cf..f7fb570132 100644 --- a/src/quick/util/qquickdeliveryagent.cpp +++ b/src/quick/util/qquickdeliveryagent.cpp @@ -1430,7 +1430,8 @@ void QQuickDeliveryAgentPrivate::flushFrameSynchronousEvents(QQuickWindow *win) qCDebug(lcHoverTrace) << q << "frame-sync hover delivery done"; } #endif - if (Q_UNLIKELY(QQuickDeliveryAgentPrivate::currentEventDeliveryAgent != q)) + if (Q_UNLIKELY(QQuickDeliveryAgentPrivate::currentEventDeliveryAgent && + QQuickDeliveryAgentPrivate::currentEventDeliveryAgent != q)) qCWarning(lcPtr, "detected interleaved frame-sync and actual events"); QQuickDeliveryAgentPrivate::currentEventDeliveryAgent = deliveringAgent; } |