diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2019-07-31 07:50:36 +0000 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2019-07-31 09:44:26 +0000 |
| commit | 238ea650cc711668b4c55fe5f208fba31da98b57 (patch) | |
| tree | d068a8ce8820f44227c4b87534e742d6f73a8bc9 | |
| parent | 9df4bab665115177b35ca1aeee6a18e9610e3a32 (diff) | |
| download | qt3d-238ea650cc711668b4c55fe5f208fba31da98b57.tar.gz | |
Revert "QWheelEvent: temporarily disable deprecation warnings around x(), y()"
This reverts commit d2c52680884095238ec3859fabaad03157af3985.
That was a temporary measure to get qt5 integration going. The code
has since been ported, so this can now be removed again.
Change-Id: I96e0470481ad8744048bef72a45f07a3bb63e2ba
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| -rw-r--r-- | src/input/frontend/qmouseevent.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/input/frontend/qmouseevent.h b/src/input/frontend/qmouseevent.h index fb9d4f86f..1402d8210 100644 --- a/src/input/frontend/qmouseevent.h +++ b/src/input/frontend/qmouseevent.h @@ -107,8 +107,6 @@ private: typedef QSharedPointer<QMouseEvent> QMouseEventPtr; -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED #if QT_CONFIG(wheelevent) class Q_3DINPUTSHARED_EXPORT QWheelEvent : public QObject { @@ -157,7 +155,6 @@ public: private: QT_PREPEND_NAMESPACE(QWheelEvent) m_event; }; -QT_WARNING_POP typedef QSharedPointer<QWheelEvent> QWheelEventPtr; #endif |