Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MixxxApplication: do not build hacks for touch input with Qt6 #4397

Merged
merged 1 commit into from
Oct 13, 2021
Merged

MixxxApplication: do not build hacks for touch input with Qt6 #4397

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/mixxxapplication.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -53,6 +54,7 @@ class QMouseEventEditable : public QMouseEvent {
};

} // anonymous namespace
#endif

MixxxApplication::MixxxApplication(int& argc, char** argv)
: QApplication(argc, argv),
Expand Down Expand Up @@ -103,6 +105,7 @@ void MixxxApplication::registerMetaTypes() {
qRegisterMetaType<mixxx::FileInfo>("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.
Expand Down Expand Up @@ -147,3 +150,4 @@ bool MixxxApplication::touchIsRightButton() {
}
return m_pTouchShift->toBool();
}
#endif