diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
index 887123083ae..c457246354d 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
@@ -1191,7 +1191,7 @@ void QWindowsFontDatabase::populateFontDatabase()
     ReleaseDC(0, dummy);
     // Work around EnumFontFamiliesEx() not listing the system font.
     QString systemDefaultFamily = QWindowsFontDatabase::systemDefaultFont().family();
-    if (QPlatformFontDatabase::resolveFontFamilyAlias(systemDefaultFamily).isEmpty())
+    if (QPlatformFontDatabase::resolveFontFamilyAlias(systemDefaultFamily) == systemDefaultFamily)
         QPlatformFontDatabase::registerFontFamily(systemDefaultFamily);
 }
 
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft.cpp
index ebb82baf6f5..7cfebf0436d 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft.cpp
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft.cpp
@@ -386,7 +386,7 @@ void QWindowsFontDatabaseFT::populateFontDatabase()
     ReleaseDC(0, dummy);
     // Work around EnumFontFamiliesEx() not listing the system font
     QString systemDefaultFamily = QWindowsFontDatabase::systemDefaultFont().family();
-    if (QPlatformFontDatabase::resolveFontFamilyAlias(systemDefaultFamily).isEmpty())
+    if (QPlatformFontDatabase::resolveFontFamilyAlias(systemDefaultFamily) == systemDefaultFamily)
         QPlatformFontDatabase::registerFontFamily(systemDefaultFamily);
 }
 
diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp
index f49ad0e7674..3f74fd52963 100644
--- a/src/plugins/platforms/windows/qwindowsintegration.cpp
+++ b/src/plugins/platforms/windows/qwindowsintegration.cpp
@@ -512,11 +512,6 @@ QVariant QWindowsIntegration::styleHint(QPlatformIntegration::StyleHint hint) co
         return QVariant(keyBoardAutoRepeatRateMS());
 #endif
     case QPlatformIntegration::ShowIsMaximized:
-#ifndef QT_NO_CLIPBOARD
-        return qt_windowsIsTabletMode(d->m_clipboard.clipboardViewer());
-#else
-        break;
-#endif
     case QPlatformIntegration::StartDragTime:
     case QPlatformIntegration::StartDragDistance:
     case QPlatformIntegration::KeyboardInputInterval: