diff options
| author | Mike Krus <mike.krus@kdab.com> | 2020-11-25 20:15:39 +0000 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2020-11-26 14:17:16 +0000 |
| commit | d6b548ac820502b961f577993cefb1b7bdd24a43 (patch) | |
| tree | f7cf4996e3dcd3d618f0611eb9eb2be777965791 /src/input | |
| parent | 4ba87fb9477e7143f3620f84ec51bd1ad9985588 (diff) | |
Fix Qt 5.15 usage
Change-Id: I62c105a3cd4a9144c0f9816a16f026fe7c146202
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/frontend/qkeyevent.cpp | 4 | ||||
| -rw-r--r-- | src/input/frontend/qmouseevent.cpp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/input/frontend/qkeyevent.cpp b/src/input/frontend/qkeyevent.cpp index 07319ea53..6df197321 100644 --- a/src/input/frontend/qkeyevent.cpp +++ b/src/input/frontend/qkeyevent.cpp @@ -81,7 +81,11 @@ QKeyEvent::QKeyEvent(QEvent::Type type, int key, Qt::KeyboardModifiers modifiers QKeyEvent::QKeyEvent(const QT_PREPEND_NAMESPACE(QKeyEvent) &ke) : QObject() +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) , m_event(static_cast<QT_PREPEND_NAMESPACE(QKeyEvent) *>(ke.clone())) +#else + , m_event(new QT_PREPEND_NAMESPACE(QKeyEvent)(ke)) +#endif { m_event->setAccepted(false); } diff --git a/src/input/frontend/qmouseevent.cpp b/src/input/frontend/qmouseevent.cpp index d73724360..b0c7427b1 100644 --- a/src/input/frontend/qmouseevent.cpp +++ b/src/input/frontend/qmouseevent.cpp @@ -262,7 +262,7 @@ QMouseEvent::QMouseEvent(const QT_PREPEND_NAMESPACE(QMouseEvent) &e) #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) , m_event(static_cast<QT_PREPEND_NAMESPACE(QMouseEvent)*>(e.clone())) #else - , m_even(new QT_PREPEND_NAMESPACE(QMouseEvent)(e)) + , m_event(new QT_PREPEND_NAMESPACE(QMouseEvent)(e)) #endif { } @@ -485,7 +485,7 @@ QWheelEvent::QWheelEvent(const QT_PREPEND_NAMESPACE(QWheelEvent) &e) #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) , m_event(static_cast<QT_PREPEND_NAMESPACE(QWheelEvent)*>(e.clone())) #else - , m_even(new QT_PREPEND_NAMESPACE(QMouseEvent)(e)) + , m_event(new QT_PREPEND_NAMESPACE(QWheelEvent)(e)) #endif { } |