From e312eb67384ea9febbe5fc9e941b7702e073715b Mon Sep 17 00:00:00 2001 From: Be Date: Wed, 13 Oct 2021 01:05:24 -0500 Subject: [PATCH] MixxxApplication: do not build hacks for touch input with Qt6 These hacks were to simulate mouse input with touch input with the legacy QWidgets GUI. They do not build with Qt6 and are not needed with QML. --- src/mixxxapplication.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/mixxxapplication.cpp b/src/mixxxapplication.cpp index 70e4178827b3..97361e22e923 100644 --- a/src/mixxxapplication.cpp +++ b/src/mixxxapplication.cpp @@ -40,6 +40,7 @@ Q_IMPORT_PLUGIN(QJpegPlugin) Q_IMPORT_PLUGIN(QGifPlugin) #endif // QT_STATIC +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) namespace { /// This class allows to change the button of a mouse event on the fly. @@ -53,6 +54,7 @@ class QMouseEventEditable : public QMouseEvent { }; } // anonymous namespace +#endif MixxxApplication::MixxxApplication(int& argc, char** argv) : QApplication(argc, argv), @@ -103,6 +105,7 @@ void MixxxApplication::registerMetaTypes() { qRegisterMetaType("mixxx::FileInfo"); } +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) bool MixxxApplication::notify(QObject* target, QEvent* event) { // All touch events are translated into two simultaneous events: one for // the target QWidgetWindow and one for the target QWidget. @@ -147,3 +150,4 @@ bool MixxxApplication::touchIsRightButton() { } return m_pTouchShift->toBool(); } +#endif