1 files changed, 2 insertions, 20 deletions
diff --git a/src/plugins/platforms/windows/qwindowscontext.cpp b/src/plugins/platforms/windows/qwindowscontext.cpp
index 289a61336f..869f2b5272 100644
--- a/src/plugins/platforms/windows/qwindowscontext.cpp
+++ b/src/plugins/platforms/windows/qwindowscontext.cpp
@@ -198,19 +198,6 @@ void QWindowsUser32DLL::init()
     }
 }
 
-bool QWindowsUser32DLL::initTouch()
-{
-    if (!isTouchWindow && QSysInfo::windowsVersion() >= QSysInfo::WV_WINDOWS7) {
-        QSystemLibrary library(QStringLiteral("user32"));
-        isTouchWindow = (IsTouchWindow)(library.resolve("IsTouchWindow"));
-        registerTouchWindow = (RegisterTouchWindow)(library.resolve("RegisterTouchWindow"));
-        unregisterTouchWindow = (UnregisterTouchWindow)(library.resolve("UnregisterTouchWindow"));
-        getTouchInputInfo = (GetTouchInputInfo)(library.resolve("GetTouchInputInfo"));
-        closeTouchInputHandle = (CloseTouchInputHandle)(library.resolve("CloseTouchInputHandle"));
-    }
-    return isTouchWindow && registerTouchWindow && unregisterTouchWindow && getTouchInputInfo && closeTouchInputHandle;
-}
-
 void QWindowsShcoreDLL::init()
 {
     if (QOperatingSystemVersion::current() < QOperatingSystemVersion::Windows8_1)
@@ -267,7 +254,7 @@ QWindowsContextPrivate::QWindowsContextPrivate()
     QWindowsContext::user32dll.init();
     QWindowsContext::shcoredll.init();
 
-    if (m_mouseHandler.touchDevice() && QWindowsContext::user32dll.initTouch())
+    if (m_mouseHandler.touchDevice())
         m_systemInfo |= QWindowsContext::SI_SupportsTouch;
     m_displayContext = GetDC(0);
     m_defaultDPI = GetDeviceCaps(m_displayContext, LOGPIXELSY);
@@ -325,11 +312,6 @@ bool QWindowsContext::initTouch(unsigned integrationOptions)
     if (!touchDevice)
         return false;
 
-    if (!QWindowsContext::user32dll.initTouch()) {
-        delete touchDevice;
-        return false;
-    }
-
     if (!(integrationOptions & QWindowsIntegration::DontPassOsMouseEventsSynthesizedFromTouch))
         touchDevice->setCapabilities(touchDevice->capabilities() | QTouchDevice::MouseEmulation);
 
@@ -755,7 +737,7 @@ HWND QWindowsContext::createDummyWindow(const QString &classNameIn,
 // present in the MSVCRT.DLL found on Windows XP (QTBUG-35617).
 static inline QString errorMessageFromComError(const _com_error &comError)
 {
-     TCHAR *message = Q_NULLPTR;
+     TCHAR *message = nullptr;
      FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
                    NULL, DWORD(comError.Error()), MAKELANGID(LANG_NEUTRAL,SUBLANG_DEFAULT),
                    message, 0, NULL);