diff options
| author | Jan Kundrát <jkt@kde.org> | 2016-07-21 11:26:21 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2017-01-10 15:04:15 +0000 |
| commit | 7f12f94e481d4908ee7b68e2cab8263b7476b054 (patch) | |
| tree | b7f50a925907f653d8963b948ba3083a4aa004dc /src/gui/kernel/qwindowsysteminterface.cpp | |
| parent | ecb025e346b662548a5dec51eda61f0c812a4f57 (diff) | |
Restore binary compatibility with pre-5.6 qt_handleMouseEvent
An internal, private symbol was changed in
beef975f92e42143c464d68afa6b8cd4f7ef7389. However, this symbol was being
used by some inline functions in QtTest, and this therefore introduced a
BIC. This change simple adds back a symbol with the original signature.
I recall seeing this in my own work, and the KDE CI system hits this as
well:
libKF5KDELibs4Support.so.5.25.0: undefined reference to
`qt_handleMouseEvent(QWindow*, QPointF const&, QPointF const&,
QFlags<Qt::MouseButton>, QFlags<Qt::KeyboardModifier>)'
Task-number: QTBUG-52205
Change-Id: I4e85996850cc436b6a31addca3a8f9829c0c5edd
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/gui/kernel/qwindowsysteminterface.cpp')
| -rw-r--r-- | src/gui/kernel/qwindowsysteminterface.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gui/kernel/qwindowsysteminterface.cpp b/src/gui/kernel/qwindowsysteminterface.cpp index 667304859e..8e86ce0b5c 100644 --- a/src/gui/kernel/qwindowsysteminterface.cpp +++ b/src/gui/kernel/qwindowsysteminterface.cpp @@ -924,6 +924,13 @@ Q_GUI_EXPORT void qt_handleMouseEvent(QWindow *w, const QPointF &local, const QP QWindowSystemInterface::handleMouseEvent<QWindowSystemInterface::SynchronousDelivery>(w, timestamp, local * factor, global * factor, b, mods); } +// Wrapper for compatibility with Qt < 5.6 +// ### Qt6: Remove +Q_GUI_EXPORT void qt_handleMouseEvent(QWindow *w, const QPointF &local, const QPointF &global, Qt::MouseButtons b, Qt::KeyboardModifiers mods = Qt::NoModifier) +{ + qt_handleMouseEvent(w, local, global, b, mods, QWindowSystemInterfacePrivate::eventTime.elapsed()); +} + Q_GUI_EXPORT void qt_handleKeyEvent(QWindow *w, QEvent::Type t, int k, Qt::KeyboardModifiers mods, const QString & text = QString(), bool autorep = false, ushort count = 1) { QWindowSystemInterface::handleKeyEvent<QWindowSystemInterface::SynchronousDelivery>(w, t, k, mods, text, autorep, count); |