From 1f1fc7fadc316f69f2fcf29eb23ff86af5ba28af Mon Sep 17 00:00:00 2001 From: Boudewijn Rempt Date: Tue, 4 Jun 2019 15:03:32 +0200 Subject: [PATCH] Rebase these patches on the correct path --- ...f-Leave-events-when-using-tablet-dev.patch | 6 ++--- ...5-Disable-tablet-relative-mode-in-Qt.patch | 6 ++--- ...d-screen-size-from-the-Wintab-driver.patch | 12 +++++----- ...inter-type-when-the-tablet-is-in-the.patch | 6 ++--- ...let-pressure-resolution-on-every-pro.patch | 6 ++--- ...0050-Fix-using-tablet-on-QML-widgets.patch | 12 +++++----- ...or-handling-table-press-correctly-in.patch | 24 +++++++++---------- 7 files changed, 36 insertions(+), 36 deletions(-) diff --git a/3rdparty/ext_qt/0022-Fix-generation-of-Leave-events-when-using-tablet-dev.patch b/3rdparty/ext_qt/0022-Fix-generation-of-Leave-events-when-using-tablet-dev.patch index 5e3a45d770..8bb29eca33 100644 --- a/3rdparty/ext_qt/0022-Fix-generation-of-Leave-events-when-using-tablet-dev.patch +++ b/3rdparty/ext_qt/0022-Fix-generation-of-Leave-events-when-using-tablet-dev.patch @@ -1,7 +1,7 @@ -diff --git a/qtbase/src/plugins/platforms/windows/qwindowspointerhandler.cpp b/qtbase/src/plugins/platforms/windows/qwindowspointerhandler.cpp +diff --git a/src/plugins/platforms/windows/qwindowspointerhandler.cpp b/src/plugins/platforms/windows/qwindowspointerhandler.cpp index 9a8b5d512..a83289de7 100644 ---- a/qtbase/src/plugins/platforms/windows/qwindowspointerhandler.cpp -+++ b/qtbase/src/plugins/platforms/windows/qwindowspointerhandler.cpp +--- a/src/plugins/platforms/windows/qwindowspointerhandler.cpp ++++ b/src/plugins/platforms/windows/qwindowspointerhandler.cpp @@ -614,7 +614,12 @@ bool QWindowsPointerHandler::translatePenEvent(QWindow *window, HWND hwnd, QtWin if (m_needsEnterOnPointerUpdate) { m_needsEnterOnPointerUpdate = false; diff --git a/3rdparty/ext_qt/0025-Disable-tablet-relative-mode-in-Qt.patch b/3rdparty/ext_qt/0025-Disable-tablet-relative-mode-in-Qt.patch index fce109dd26..bf980b96e2 100644 --- a/3rdparty/ext_qt/0025-Disable-tablet-relative-mode-in-Qt.patch +++ b/3rdparty/ext_qt/0025-Disable-tablet-relative-mode-in-Qt.patch @@ -1,7 +1,7 @@ -diff --git a/qtbase/src/plugins/platforms/windows/qwindowstabletsupport.cpp b/qtbase/src/plugins/platforms/windows/qwindowstabletsupport.cpp +diff --git a/src/plugins/platforms/windows/qwindowstabletsupport.cpp b/src/plugins/platforms/windows/qwindowstabletsupport.cpp index fa209f09c..d31998825 100644 ---- a/qtbase/src/plugins/platforms/windows/qwindowstabletsupport.cpp -+++ b/qtbase/src/plugins/platforms/windows/qwindowstabletsupport.cpp +--- a/src/plugins/platforms/windows/qwindowstabletsupport.cpp ++++ b/src/plugins/platforms/windows/qwindowstabletsupport.cpp @@ -497,6 +497,11 @@ bool QWindowsTabletSupport::translateTabletPacketEvent() m_state = PenDown; m_mode = (mouseLocation - globalPosF).manhattanLength() > m_absoluteRange diff --git a/3rdparty/ext_qt/0026-Fetch-mapped-screen-size-from-the-Wintab-driver.patch b/3rdparty/ext_qt/0026-Fetch-mapped-screen-size-from-the-Wintab-driver.patch index f3c1e5b2c2..190252774d 100644 --- a/3rdparty/ext_qt/0026-Fetch-mapped-screen-size-from-the-Wintab-driver.patch +++ b/3rdparty/ext_qt/0026-Fetch-mapped-screen-size-from-the-Wintab-driver.patch @@ -1,7 +1,7 @@ -diff --git a/qtbase/src/plugins/platforms/windows/qwindowstabletsupport.cpp b/qtbase/src/plugins/platforms/windows/qwindowstabletsupport.cpp +diff --git a/src/plugins/platforms/windows/qwindowstabletsupport.cpp b/src/plugins/platforms/windows/qwindowstabletsupport.cpp index fa209f09c..318e8372c 100644 ---- a/qtbase/src/plugins/platforms/windows/qwindowstabletsupport.cpp -+++ b/qtbase/src/plugins/platforms/windows/qwindowstabletsupport.cpp +--- a/src/plugins/platforms/windows/qwindowstabletsupport.cpp ++++ b/src/plugins/platforms/windows/qwindowstabletsupport.cpp @@ -53,6 +53,7 @@ #include #include @@ -126,10 +126,10 @@ index fa209f09c..318e8372c 100644 if (QWindowsContext::verbose > 1) { qCDebug(lcQpaTablet) << __FUNCTION__ << "processing" << packetCount -diff --git a/qtbase/src/plugins/platforms/windows/qwindowstabletsupport.h b/qtbase/src/plugins/platforms/windows/qwindowstabletsupport.h +diff --git a/src/plugins/platforms/windows/qwindowstabletsupport.h b/src/plugins/platforms/windows/qwindowstabletsupport.h index d91701d6a..572af8cad 100644 ---- a/qtbase/src/plugins/platforms/windows/qwindowstabletsupport.h -+++ b/qtbase/src/plugins/platforms/windows/qwindowstabletsupport.h +--- a/src/plugins/platforms/windows/qwindowstabletsupport.h ++++ b/src/plugins/platforms/windows/qwindowstabletsupport.h @@ -45,6 +45,10 @@ #include diff --git a/3rdparty/ext_qt/0027-Switch-stylus-pointer-type-when-the-tablet-is-in-the.patch b/3rdparty/ext_qt/0027-Switch-stylus-pointer-type-when-the-tablet-is-in-the.patch index 87b1932323..a0cb57bef3 100644 --- a/3rdparty/ext_qt/0027-Switch-stylus-pointer-type-when-the-tablet-is-in-the.patch +++ b/3rdparty/ext_qt/0027-Switch-stylus-pointer-type-when-the-tablet-is-in-the.patch @@ -1,7 +1,7 @@ -diff --git a/qtbase/src/plugins/platforms/windows/qwindowstabletsupport.cpp b/qtbase/src/plugins/platforms/windows/qwindowstabletsupport.cpp +diff --git a/src/plugins/platforms/windows/qwindowstabletsupport.cpp b/src/plugins/platforms/windows/qwindowstabletsupport.cpp index fa209f09c..d959da90b 100644 ---- a/qtbase/src/plugins/platforms/windows/qwindowstabletsupport.cpp -+++ b/qtbase/src/plugins/platforms/windows/qwindowstabletsupport.cpp +--- a/src/plugins/platforms/windows/qwindowstabletsupport.cpp ++++ b/src/plugins/platforms/windows/qwindowstabletsupport.cpp @@ -454,7 +454,6 @@ bool QWindowsTabletSupport::translateTabletPacketEvent() return false; diff --git a/3rdparty/ext_qt/0028-Fix-updating-tablet-pressure-resolution-on-every-pro.patch b/3rdparty/ext_qt/0028-Fix-updating-tablet-pressure-resolution-on-every-pro.patch index 46f6fdc329..6789fd7b8e 100644 --- a/3rdparty/ext_qt/0028-Fix-updating-tablet-pressure-resolution-on-every-pro.patch +++ b/3rdparty/ext_qt/0028-Fix-updating-tablet-pressure-resolution-on-every-pro.patch @@ -1,7 +1,7 @@ -diff --git a/qtbase/src/plugins/platforms/windows/qwindowstabletsupport.cpp b/qtbase/src/plugins/platforms/windows/qwindowstabletsupport.cpp +diff --git a/src/plugins/platforms/windows/qwindowstabletsupport.cpp b/src/plugins/platforms/windows/qwindowstabletsupport.cpp index fa209f09c..462be8b3f 100644 ---- a/qtbase/src/plugins/platforms/windows/qwindowstabletsupport.cpp -+++ b/qtbase/src/plugins/platforms/windows/qwindowstabletsupport.cpp +--- a/src/plugins/platforms/windows/qwindowstabletsupport.cpp ++++ b/src/plugins/platforms/windows/qwindowstabletsupport.cpp @@ -434,6 +434,14 @@ bool QWindowsTabletSupport::translateTabletProximityEvent(WPARAM /* wParam */, L if (m_currentDevice < 0) { m_currentDevice = m_devices.size(); diff --git a/3rdparty/ext_qt/0050-Fix-using-tablet-on-QML-widgets.patch b/3rdparty/ext_qt/0050-Fix-using-tablet-on-QML-widgets.patch index 37ad773316..985e54fde5 100644 --- a/3rdparty/ext_qt/0050-Fix-using-tablet-on-QML-widgets.patch +++ b/3rdparty/ext_qt/0050-Fix-using-tablet-on-QML-widgets.patch @@ -1,7 +1,7 @@ -diff --git a/qtbase/src/plugins/platforms/windows/qwindowspointerhandler.cpp b/qtbase/src/plugins/platforms/windows/qwindowspointerhandler.cpp +diff --git a/src/plugins/platforms/windows/qwindowspointerhandler.cpp b/src/plugins/platforms/windows/qwindowspointerhandler.cpp index 9a8b5d512..4a8322337 100644 ---- a/qtbase/src/plugins/platforms/windows/qwindowspointerhandler.cpp -+++ b/qtbase/src/plugins/platforms/windows/qwindowspointerhandler.cpp +--- a/src/plugins/platforms/windows/qwindowspointerhandler.cpp ++++ b/src/plugins/platforms/windows/qwindowspointerhandler.cpp @@ -639,14 +639,16 @@ bool QWindowsPointerHandler::translatePenEvent(QWindow *window, HWND hwnd, QtWin #endif } @@ -30,10 +30,10 @@ index 9a8b5d512..4a8322337 100644 if (QWindowsIntegration::instance()->options() & QWindowsIntegration::DontPassOsMouseEventsSynthesizedFromTouch) return false; source = Qt::MouseEventSynthesizedBySystem; -diff --git a/qtbase/src/plugins/platforms/windows/qwindowstabletsupport.cpp b/qtbase/src/plugins/platforms/windows/qwindowstabletsupport.cpp +diff --git a/src/plugins/platforms/windows/qwindowstabletsupport.cpp b/src/plugins/platforms/windows/qwindowstabletsupport.cpp index fa209f09c..462be8b3f 100644 ---- a/qtbase/src/plugins/platforms/windows/qwindowstabletsupport.cpp -+++ b/qtbase/src/plugins/platforms/windows/qwindowstabletsupport.cpp +--- a/src/plugins/platforms/windows/qwindowstabletsupport.cpp ++++ b/src/plugins/platforms/windows/qwindowstabletsupport.cpp @@ -434,6 +434,14 @@ bool QWindowsTabletSupport::translateTabletProximityEvent(WPARAM /* wParam */, L if (m_currentDevice < 0) { m_currentDevice = m_devices.size(); diff --git a/3rdparty/ext_qt/0051-Add-workaround-for-handling-table-press-correctly-in.patch b/3rdparty/ext_qt/0051-Add-workaround-for-handling-table-press-correctly-in.patch index d8d28b29f3..f19abc566c 100644 --- a/3rdparty/ext_qt/0051-Add-workaround-for-handling-table-press-correctly-in.patch +++ b/3rdparty/ext_qt/0051-Add-workaround-for-handling-table-press-correctly-in.patch @@ -1,7 +1,7 @@ -diff --git a/qtbase/src/gui/kernel/qguiapplication.cpp b/qtbase/src/gui/kernel/qguiapplication.cpp +diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index fd01f8bb7..4d61d9fd8 100644 ---- a/qtbase/src/gui/kernel/qguiapplication.cpp -+++ b/qtbase/src/gui/kernel/qguiapplication.cpp +--- a/src/gui/kernel/qguiapplication.cpp ++++ b/src/gui/kernel/qguiapplication.cpp @@ -2532,6 +2532,7 @@ void QGuiApplicationPrivate::processTabletEvent(QWindowSystemInterfacePrivate::T tabletEvent.setTimestamp(e->timestamp); QGuiApplication::sendSpontaneousEvent(window, &tabletEvent); @@ -10,10 +10,10 @@ index fd01f8bb7..4d61d9fd8 100644 if (!tabletEvent.isAccepted() && !QWindowSystemInterfacePrivate::TabletEvent::platformSynthesizesMouse && qApp->testAttribute(Qt::AA_SynthesizeMouseForUnhandledTabletEvents)) { -diff --git a/qtbase/src/gui/kernel/qwindowsysteminterface.cpp b/qtbase/src/gui/kernel/qwindowsysteminterface.cpp +diff --git a/src/gui/kernel/qwindowsysteminterface.cpp b/src/gui/kernel/qwindowsysteminterface.cpp index b0f286912..b3b6167c9 100644 ---- a/qtbase/src/gui/kernel/qwindowsysteminterface.cpp -+++ b/qtbase/src/gui/kernel/qwindowsysteminterface.cpp +--- a/src/gui/kernel/qwindowsysteminterface.cpp ++++ b/src/gui/kernel/qwindowsysteminterface.cpp @@ -949,7 +949,7 @@ void QWindowSystemInterfacePrivate::TabletEvent::setPlatformSynthesizesMouse(boo platformSynthesizesMouse = v; } @@ -69,10 +69,10 @@ index b0f286912..b3b6167c9 100644 } #endif // QT_DEPRECATED_SINCE(5, 10) -diff --git a/qtbase/src/gui/kernel/qwindowsysteminterface.h b/qtbase/src/gui/kernel/qwindowsysteminterface.h +diff --git a/src/gui/kernel/qwindowsysteminterface.h b/src/gui/kernel/qwindowsysteminterface.h index bf98c33a1..fdc5a2fb5 100644 ---- a/qtbase/src/gui/kernel/qwindowsysteminterface.h -+++ b/qtbase/src/gui/kernel/qwindowsysteminterface.h +--- a/src/gui/kernel/qwindowsysteminterface.h ++++ b/src/gui/kernel/qwindowsysteminterface.h @@ -247,20 +247,20 @@ public: static void handleFileOpenEvent(const QString& fileName); static void handleFileOpenEvent(const QUrl &url); @@ -98,10 +98,10 @@ index bf98c33a1..fdc5a2fb5 100644 int device, int pointerType, qreal pressure, int xTilt, int yTilt, qreal tangentialPressure, qreal rotation, int z, qint64 uid, Qt::KeyboardModifiers modifiers = Qt::NoModifier); -diff --git a/qtbase/src/plugins/platforms/windows/qwindowspointerhandler.cpp b/qtbase/src/plugins/platforms/windows/qwindowspointerhandler.cpp +diff --git a/src/plugins/platforms/windows/qwindowspointerhandler.cpp b/src/plugins/platforms/windows/qwindowspointerhandler.cpp index 9a8b5d512..93498d58b 100644 ---- a/qtbase/src/plugins/platforms/windows/qwindowspointerhandler.cpp -+++ b/qtbase/src/plugins/platforms/windows/qwindowspointerhandler.cpp +--- a/src/plugins/platforms/windows/qwindowspointerhandler.cpp ++++ b/src/plugins/platforms/windows/qwindowspointerhandler.cpp @@ -535,6 +535,58 @@ bool QWindowsPointerHandler::translateTouchEvent(QWindow *window, HWND hwnd, return false; // Allow mouse messages to be generated. } -- GitLab