1 files changed, 14 insertions, 2 deletions
diff --git a/src/plugins/platforms/windows/qwindowsnativeinterface.cpp b/src/plugins/platforms/windows/qwindowsnativeinterface.cpp
index eaa6e45b9f..d750eef19d 100644
--- a/src/plugins/platforms/windows/qwindowsnativeinterface.cpp
+++ b/src/plugins/platforms/windows/qwindowsnativeinterface.cpp
@@ -38,6 +38,7 @@
 ****************************************************************************/
 
 #include "qwindowsnativeinterface.h"
+#include "qwindowsclipboard.h"
 #include "qwindowswindow.h"
 #include "qwindowscontext.h"
 #include "qwindowscursor.h"
@@ -45,6 +46,7 @@
 #include "qwindowsopengltester.h"
 #include "qwindowsintegration.h"
 #include "qwindowsmime.h"
+#include "qwin10helpers.h"
 
 #include <QtGui/QWindow>
 #include <QtGui/QOpenGLContext>
@@ -108,6 +110,7 @@ void *QWindowsNativeInterface::nativeResourceForWindow(const QByteArray &resourc
         }
         break;
     case QWindow::OpenGLSurface:
+    case QWindow::OpenVGSurface:
         break;
     }
     qWarning("%s: Invalid key '%s' requested.", __FUNCTION__, resource.constData());
@@ -252,14 +255,23 @@ QFont QWindowsNativeInterface::logFontToQFont(const void *logFont, int verticalD
     return QWindowsFontDatabase::LOGFONT_to_QFont(*reinterpret_cast<const LOGFONT *>(logFont), verticalDpi);
 }
 
+bool QWindowsNativeInterface::isTabletMode()
+{
+#if QT_CONFIG(clipboard)
+    if (const QWindowsClipboard *clipboard = QWindowsClipboard::instance())
+        return qt_windowsIsTabletMode(clipboard->clipboardViewer());
+#endif
+    return false;
+}
+
 QFunctionPointer QWindowsNativeInterface::platformFunction(const QByteArray &function) const
 {
     if (function == QWindowsWindowFunctions::setTouchWindowTouchTypeIdentifier())
         return QFunctionPointer(QWindowsWindow::setTouchWindowTouchTypeStatic);
     else if (function == QWindowsWindowFunctions::setHasBorderInFullScreenIdentifier())
         return QFunctionPointer(QWindowsWindow::setHasBorderInFullScreenStatic);
-    else if (function == QWindowsWindowFunctions::setWindowActivationBehaviorIdentifier())
-        return QFunctionPointer(QWindowsNativeInterface::setWindowActivationBehavior);
+    else if (function == QWindowsWindowFunctions::isTabletModeIdentifier())
+        return QFunctionPointer(QWindowsNativeInterface::isTabletMode);
     return Q_NULLPTR;
 }