Merge remote-tracking branch 'upstream/2.2' into 2.3

1 files changed, 3 insertions, 3 deletions

diff --git a/src/mixxxapplication.h b/src/mixxxapplication.h
index 1348de29e2..a9a5a67524 100644
--- a/src/mixxxapplication.h
+++ b/src/mixxxapplication.h
@@ -11,13 +11,13 @@ class MixxxApplication : public QApplication {
     MixxxApplication(int& argc, char** argv);
     ~MixxxApplication() override = default;
 
+    bool notify(QObject*, QEvent*) override;
+
   private:
     bool touchIsRightButton();
     void registerMetaTypes();
 
-    int m_fakeMouseSourcePointId;
-    QWidget* m_fakeMouseWidget;
-    enum Qt::MouseButton m_activeTouchButton;
+    int m_rightPressedButtons;
     ControlProxy* m_pTouchShift;
 
 };