3rdparty/ext_qt/0001-disable-wintab.patch

0001 From 16a528dfc3ef30fee213026391c923d4d19fd4a0 Mon Sep 17 00:00:00 2001
0002 From: Dmitry Kazakov <dimula73@gmail.com>
0003 Date: Mon, 11 Feb 2019 17:51:39 +0300
0004 Subject: [PATCH 1/4] disable wintab
0005
0006 Change-Id: I10095ac8c486fcccb97f4a8d7036441eea6a1bc0
0007 ---
0008  .../platforms/windows/qwindowscontext.cpp     | 24 -------------------
0009  1 file changed, 24 deletions(-)
0010
0011 diff --git a/src/plugins/platforms/windows/qwindowscontext.cpp b/src/plugins/platforms/windows/qwindowscontext.cpp
0012 index 1f80ac5872..ded8130398 100644
0013 --- a/src/plugins/platforms/windows/qwindowscontext.cpp
0014 +++ b/src/plugins/platforms/windows/qwindowscontext.cpp
0015 @@ -265,9 +265,6 @@ struct QWindowsContextPrivate {
0016      QWindowsMimeConverter m_mimeConverter;
0017      QWindowsScreenManager m_screenManager;
0018      QSharedPointer<QWindowCreationContext> m_creationContext;
0019 -#if QT_CONFIG(tabletevent)
0020 -    QScopedPointer<QWindowsTabletSupport> m_tabletSupport;
0021 -#endif
0022      const HRESULT m_oleInitializeResult;
0023      QWindow *m_lastActiveWindow = nullptr;
0024      bool m_asyncExpose = false;
0025 @@ -308,9 +305,6 @@ QWindowsContext::QWindowsContext() :
0026
0027  QWindowsContext::~QWindowsContext()
0028  {
0029 -#if QT_CONFIG(tabletevent)
0030 -    d->m_tabletSupport.reset(); // Destroy internal window before unregistering classes.
0031 -#endif
0032      unregisterWindowClasses();
0033      if (d->m_oleInitializeResult == S_OK || d->m_oleInitializeResult == S_FALSE)
0034          OleUninitialize();
0035 @@ -357,12 +351,7 @@ bool QWindowsContext::initTouch(unsigned integrationOptions)
0036  bool QWindowsContext::initTablet(unsigned integrationOptions)
0037  {
0038      Q_UNUSED(integrationOptions);
0039 -#if QT_CONFIG(tabletevent)
0040 -    d->m_tabletSupport.reset(QWindowsTabletSupport::create());
0041 -    return true;
0042 -#else
0043      return false;
0044 -#endif
0045  }
0046
0047  bool QWindowsContext::initPointer(unsigned integrationOptions)
0048 @@ -383,12 +372,7 @@ bool QWindowsContext::initPointer(unsigned integrationOptions)
0049
0050  void QWindowsContext::setTabletAbsoluteRange(int a)
0051  {
0052 -#if QT_CONFIG(tabletevent)
0053 -    if (!d->m_tabletSupport.isNull())
0054 -        d->m_tabletSupport->setAbsoluteRange(a);
0055 -#else
0056      Q_UNUSED(a)
0057 -#endif
0058  }
0059
0060  void QWindowsContext::setDetectAltGrModifier(bool a)
0061 @@ -799,11 +783,7 @@ QWindowsScreenManager &QWindowsContext::screenManager()
0062
0063  QWindowsTabletSupport *QWindowsContext::tabletSupport() const
0064  {
0065 -#if QT_CONFIG(tabletevent)
0066 -    return d->m_tabletSupport.data();
0067 -#else
0068      return 0;
0069 -#endif
0070  }
0071
0072  /*!
0073 @@ -1288,10 +1268,6 @@ bool QWindowsContext::windowsProc(HWND hwnd, UINT message,
0074              *result = LRESULT(MA_NOACTIVATE);
0075              return true;
0076          }
0077 -#if QT_CONFIG(tabletevent)
0078 -        if (!d->m_tabletSupport.isNull())
0079 -            d->m_tabletSupport->notifyActivate();
0080 -#endif // QT_CONFIG(tabletevent)
0081          if (platformWindow->testFlag(QWindowsWindow::BlockedByModal))
0082              if (const QWindow *modalWindow = QGuiApplication::modalWindow()) {
0083                  QWindowsWindow *platformWindow = QWindowsWindow::windowsWindowOf(modalWindow);
0084 --
0085 2.20.1.windows.1
0086