diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2019-07-31 08:54:08 +0300 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2019-07-31 06:18:31 +0000 |
| commit | d2c52680884095238ec3859fabaad03157af3985 (patch) | |
| tree | 34039853c73dc3d611bf692182c78fb9107f8305 /src/input | |
| parent | ff884fcc2c9ddf7b5bc37dad8c998f56b67a8c14 (diff) | |
QWheelEvent: temporarily disable deprecation warnings around x(), y()
... in an attempt to unblock qt5 integration.
Put the warning suppression macros further apart than necessary to
avoid clashing with the actual fix.
Change-Id: I362712d1c6b3035966179755cdc6e631d1954255
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/frontend/qmouseevent.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/input/frontend/qmouseevent.h b/src/input/frontend/qmouseevent.h index a7aa8fe2b..87b648be3 100644 --- a/src/input/frontend/qmouseevent.h +++ b/src/input/frontend/qmouseevent.h @@ -107,6 +107,8 @@ private: typedef QSharedPointer<QMouseEvent> QMouseEventPtr; +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED #if QT_CONFIG(wheelevent) class Q_3DINPUTSHARED_EXPORT QWheelEvent : public QObject { @@ -155,6 +157,7 @@ public: private: QT_PREPEND_NAMESPACE(QWheelEvent) m_event; }; +QT_WARNING_POP typedef QSharedPointer<QWheelEvent> QWheelEventPtr; #endif |