diff options
author | Fabian Kosmale <[email protected]> | 2020-08-26 11:21:49 +0200 |
---|---|---|
committer | Fabian Kosmale <[email protected]> | 2020-08-26 13:29:44 +0000 |
commit | 9aa152da3d416c7d5b4e0e970b6eb1a301df1028 (patch) | |
tree | f6c770dffa6c86025ce387ba3c89edff2deee0fc /src | |
parent | bb1e23d8f02451f92a9fa0f2570de4dce065170c (diff) |
Remove deprecated QQuickWindow::sendEvent
[ChangeLog][QQuickWindow] Removed the obsolete QQuickWindow::sendEvent
function. Use QCoreApplication::sendEvent instead.
Change-Id: I583ea8f87b870b136315efa4e1105de484e5f1ab
Reviewed-by: Qt CI Bot <[email protected]>
Reviewed-by: Maximilian Goldstein <[email protected]>
Reviewed-by: Ulf Hermann <[email protected]>
Reviewed-by: Shawn Rutledge <[email protected]>
Diffstat (limited to 'src')
-rw-r--r-- | src/quick/items/qquickwindow.cpp | 56 | ||||
-rw-r--r-- | src/quick/items/qquickwindow.h | 4 |
2 files changed, 0 insertions, 60 deletions
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index 60d48a6bf0..9489789a87 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -3600,62 +3600,6 @@ void QQuickWindowPrivate::rhiCreationFailureMessage(const QString &backendName, *untranslatedMessage = QString::fromLatin1(msg).arg(backendName); } -#if QT_DEPRECATED_SINCE(5, 8) - -// ### Qt6: remove -/*! - Propagates an event \a e to a QQuickItem \a item on the window. - - Use \l QCoreApplication::sendEvent() directly instead. - - The return value is currently not used. - - \deprecated -*/ -bool QQuickWindow::sendEvent(QQuickItem *item, QEvent *e) -{ - Q_D(QQuickWindow); - - if (!item) { - qWarning("QQuickWindow::sendEvent: Cannot send event to a null item"); - return false; - } - - Q_ASSERT(e); - - switch (e->type()) { - case QEvent::KeyPress: - case QEvent::KeyRelease: - e->accept(); - QCoreApplication::sendEvent(item, e); - while (!e->isAccepted() && (item = item->parentItem())) { - e->accept(); - QCoreApplication::sendEvent(item, e); - } - break; - case QEvent::MouseButtonPress: - case QEvent::MouseButtonRelease: - case QEvent::MouseButtonDblClick: - case QEvent::MouseMove: { - // XXX todo - should sendEvent be doing this? how does it relate to forwarded events? - d->hasFiltered.clear(); - if (!d->sendFilteredMouseEvent(e, item, item->parentItem())) { - // accept because qml items by default accept and have to explicitly opt out of accepting - e->accept(); - QCoreApplication::sendEvent(item, e); - } - } - break; - default: - QCoreApplication::sendEvent(item, e); - break; - } - - return false; -} - -#endif - void QQuickWindowPrivate::cleanupNodes() { for (int ii = 0; ii < cleanupNodeList.count(); ++ii) diff --git a/src/quick/items/qquickwindow.h b/src/quick/items/qquickwindow.h index 6af11dba39..32e8d4b5a1 100644 --- a/src/quick/items/qquickwindow.h +++ b/src/quick/items/qquickwindow.h @@ -125,10 +125,6 @@ public: QQuickItem *mouseGrabberItem() const; -#if QT_DEPRECATED_SINCE(5, 8) - QT_DEPRECATED bool sendEvent(QQuickItem *, QEvent *); -#endif - QImage grabWindow(); void setRenderTarget(const QQuickRenderTarget &target); |