1 files changed, 7 insertions, 6 deletions
diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp
index d8d04fc1b6..45f6ecf652 100644
--- a/src/plugins/platforms/windows/qwindowsintegration.cpp
+++ b/src/plugins/platforms/windows/qwindowsintegration.cpp
@@ -56,7 +56,9 @@
 #include "qwindowsdrag.h"
 #include "qwindowsinputcontext.h"
 #include "qwindowskeymapper.h"
+#ifndef QT_NO_ACCESSIBILITY
 #include "accessible/qwindowsaccessibility.h"
+#endif
 
 #include <QtGui/QPlatformNativeInterface>
 #include <QtGui/QWindowSystemInterface>
@@ -182,7 +184,9 @@ struct QWindowsIntegrationPrivate
     QWindowsGuiEventDispatcher *m_eventDispatcher;
     QOpenGLStaticContextPtr m_staticOpenGLContext;
     QWindowsInputContext m_inputContext;
+#ifndef QT_NO_ACCESSIBILITY
     QWindowsAccessibility m_accessibility;
+#endif
     QWindowsServices m_services;
 };
 
@@ -281,7 +285,6 @@ QPlatformOpenGLContext
  * QML2 applications. */
 
 enum FontDatabaseOption {
-    FontDatabaseAuto,
     FontDatabaseFreeType,
     FontDatabaseNative
 };
@@ -296,7 +299,7 @@ static inline FontDatabaseOption fontDatabaseOption(const QObject &nativeInterfa
         if (argument == QLatin1String("native"))
             return FontDatabaseNative;
     }
-    return FontDatabaseAuto;
+    return FontDatabaseNative;
 }
 
 QPlatformFontDatabase *QWindowsIntegration::fontDatabase() const
@@ -306,10 +309,6 @@ QPlatformFontDatabase *QWindowsIntegration::fontDatabase() const
         d->m_fontDatabase = new QWindowsFontDatabase();
 #else
         FontDatabaseOption option = fontDatabaseOption(d->m_nativeInterface);
-        if (option == FontDatabaseAuto) {
-            option = QCoreApplication::applicationName() == QStringLiteral("QtQmlViewer") ?
-                     FontDatabaseFreeType : FontDatabaseNative;
-        }
         if (option == FontDatabaseFreeType) {
             d->m_fontDatabase = new QWindowsFontDatabaseFT;
         } else {
@@ -374,10 +373,12 @@ QPlatformInputContext * QWindowsIntegration::inputContext() const
     return &d->m_inputContext;
 }
 
+#ifndef QT_NO_ACCESSIBILITY
 QPlatformAccessibility *QWindowsIntegration::accessibility() const
 {
     return &d->m_accessibility;
 }
+#endif
 
 QWindowsIntegration *QWindowsIntegration::instance()
 {