1 files changed, 18 insertions, 7 deletions
diff --git a/src/plugins/platforms/windows/qwindowsnativeinterface.cpp b/src/plugins/platforms/windows/qwindowsnativeinterface.cpp
index de11356fd4..b8ab7f8779 100644
--- a/src/plugins/platforms/windows/qwindowsnativeinterface.cpp
+++ b/src/plugins/platforms/windows/qwindowsnativeinterface.cpp
@@ -95,7 +95,7 @@ void *QWindowsNativeInterface::nativeResourceForWindow(const QByteArray &resourc
 {
     if (!window || !window->handle()) {
         qWarning("%s: '%s' requested for null window or window without handle.", __FUNCTION__, resource.constData());
-        return 0;
+        return nullptr;
     }
     QWindowsWindow *bw = static_cast<QWindowsWindow *>(window->handle());
     int type = resourceType(resource);
@@ -108,7 +108,7 @@ void *QWindowsNativeInterface::nativeResourceForWindow(const QByteArray &resourc
             return bw->getDC();
         if (type == ReleaseDCType) {
             bw->releaseDC();
-            return 0;
+            return nullptr;
         }
         break;
     case QWindow::VulkanSurface:
@@ -121,7 +121,7 @@ void *QWindowsNativeInterface::nativeResourceForWindow(const QByteArray &resourc
         break;
     }
     qWarning("%s: Invalid key '%s' requested.", __FUNCTION__, resource.constData());
-    return 0;
+    return nullptr;
 }
 
 #ifndef QT_NO_CURSOR
@@ -143,7 +143,7 @@ QVariant QWindowsNativeInterface::windowProperty(QPlatformWindow *window, const
 {
     QWindowsWindow *platformWindow = static_cast<QWindowsWindow *>(window);
     if (name == QLatin1String(customMarginPropertyC))
-        return qVariantFromValue(platformWindow->customMargins());
+        return QVariant::fromValue(platformWindow->customMargins());
     return QVariant();
 }
 
@@ -179,7 +179,7 @@ void *QWindowsNativeInterface::nativeResourceForIntegration(const QByteArray &re
     }
 #endif
 
-    return 0;
+    return nullptr;
 }
 
 #ifndef QT_NO_OPENGL
@@ -187,7 +187,7 @@ void *QWindowsNativeInterface::nativeResourceForContext(const QByteArray &resour
 {
     if (!context || !context->handle()) {
         qWarning("%s: '%s' requested for null context or context without handle.", __FUNCTION__, resource.constData());
-        return 0;
+        return nullptr;
     }
 
     QWindowsOpenGLContext *glcontext = static_cast<QWindowsOpenGLContext *>(context->handle());
@@ -204,7 +204,7 @@ void *QWindowsNativeInterface::nativeResourceForContext(const QByteArray &resour
     }
 
     qWarning("%s: Invalid key '%s' requested.", __FUNCTION__, resource.constData());
-    return 0;
+    return nullptr;
 }
 #endif // !QT_NO_OPENGL
 
@@ -277,6 +277,8 @@ QFunctionPointer QWindowsNativeInterface::platformFunction(const QByteArray &fun
         return QFunctionPointer(QWindowsWindow::setTouchWindowTouchTypeStatic);
     if (function == QWindowsWindowFunctions::setHasBorderInFullScreenIdentifier())
         return QFunctionPointer(QWindowsWindow::setHasBorderInFullScreenStatic);
+    if (function == QWindowsWindowFunctions::setHasBorderInFullScreenDefaultIdentifier())
+        return QFunctionPointer(QWindowsWindow::setHasBorderInFullScreenDefault);
     if (function == QWindowsWindowFunctions::setWindowActivationBehaviorIdentifier())
         return QFunctionPointer(QWindowsNativeInterface::setWindowActivationBehavior);
     if (function == QWindowsWindowFunctions::isTabletModeIdentifier())
@@ -289,4 +291,13 @@ QVariant QWindowsNativeInterface::gpu() const
     return GpuDescription::detect().toVariant();
 }
 
+QVariant QWindowsNativeInterface::gpuList() const
+{
+    QVariantList result;
+    const auto gpus = GpuDescription::detectAll();
+    for (const auto &gpu : gpus)
+        result.append(gpu.toVariant());
+    return result;
+}
+
 QT_END_NAMESPACE