Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Miguel Lopez
Krita
Commits
1f1fc7fa
Commit
1f1fc7fa
authored
Jun 04, 2019
by
Halla Rempt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rebase these patches on the correct path
parent
6ef2e934
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
36 additions
and
36 deletions
+36
-36
3rdparty/ext_qt/0022-Fix-generation-of-Leave-events-when-using-tablet-dev.patch
...ix-generation-of-Leave-events-when-using-tablet-dev.patch
+3
-3
3rdparty/ext_qt/0025-Disable-tablet-relative-mode-in-Qt.patch
...arty/ext_qt/0025-Disable-tablet-relative-mode-in-Qt.patch
+3
-3
3rdparty/ext_qt/0026-Fetch-mapped-screen-size-from-the-Wintab-driver.patch
...026-Fetch-mapped-screen-size-from-the-Wintab-driver.patch
+6
-6
3rdparty/ext_qt/0027-Switch-stylus-pointer-type-when-the-tablet-is-in-the.patch
...witch-stylus-pointer-type-when-the-tablet-is-in-the.patch
+3
-3
3rdparty/ext_qt/0028-Fix-updating-tablet-pressure-resolution-on-every-pro.patch
...ix-updating-tablet-pressure-resolution-on-every-pro.patch
+3
-3
3rdparty/ext_qt/0050-Fix-using-tablet-on-QML-widgets.patch
3rdparty/ext_qt/0050-Fix-using-tablet-on-QML-widgets.patch
+6
-6
3rdparty/ext_qt/0051-Add-workaround-for-handling-table-press-correctly-in.patch
...dd-workaround-for-handling-table-press-correctly-in.patch
+12
-12
No files found.
3rdparty/ext_qt/0022-Fix-generation-of-Leave-events-when-using-tablet-dev.patch
View file @
1f1fc7fa
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;
...
...
3rdparty/ext_qt/0025-Disable-tablet-relative-mode-in-Qt.patch
View file @
1f1fc7fa
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
...
...
3rdparty/ext_qt/0026-Fetch-mapped-screen-size-from-the-Wintab-driver.patch
View file @
1f1fc7fa
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 <QtCore/qdebug.h>
#include <QtCore/qvarlengtharray.h>
...
...
@@ -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 <QtCore/qvector.h>
...
...
3rdparty/ext_qt/0027-Switch-stylus-pointer-type-when-the-tablet-is-in-the.patch
View file @
1f1fc7fa
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;
...
...
3rdparty/ext_qt/0028-Fix-updating-tablet-pressure-resolution-on-every-pro.patch
View file @
1f1fc7fa
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();
...
...
3rdparty/ext_qt/0050-Fix-using-tablet-on-QML-widgets.patch
View file @
1f1fc7fa
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();
...
...
3rdparty/ext_qt/0051-Add-workaround-for-handling-table-press-correctly-in.patch
View file @
1f1fc7fa
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.
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment