6 files changed, 29 insertions, 5 deletions
diff --git a/src/platformsupport/fontdatabases/fontdatabases.pro b/src/platformsupport/fontdatabases/fontdatabases.pro
index 7fc4ecc115..9376c3b702 100644
--- a/src/platformsupport/fontdatabases/fontdatabases.pro
+++ b/src/platformsupport/fontdatabases/fontdatabases.pro
@@ -24,6 +24,10 @@ darwin:!if(watchos:CONFIG(simulator, simulator|device)) {
     win32:!winrt {
         include($$PWD/windows/windows.pri)
     }
+
+    winrt {
+        include($$PWD/winrt/winrt.pri)
+    }
 }
 
 load(qt_module)
diff --git a/src/plugins/platforms/winrt/qwinrtfontdatabase.cpp b/src/platformsupport/fontdatabases/winrt/qwinrtfontdatabase.cpp
index d4f2ba1bd6..f214184c36 100644
--- a/src/plugins/platforms/winrt/qwinrtfontdatabase.cpp
+++ b/src/platformsupport/fontdatabases/winrt/qwinrtfontdatabase.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "qwinrtfontdatabase.h"
+#include "qwinrtfontdatabase_p.h"
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QFile>
diff --git a/src/plugins/platforms/winrt/qwinrtfontdatabase.h b/src/platformsupport/fontdatabases/winrt/qwinrtfontdatabase_p.h
index 8fed4a3fa7..9559bac0a8 100644
--- a/src/plugins/platforms/winrt/qwinrtfontdatabase.h
+++ b/src/platformsupport/fontdatabases/winrt/qwinrtfontdatabase_p.h
@@ -40,6 +40,17 @@
 #ifndef QWINRTFONTDATABASE_H
 #define QWINRTFONTDATABASE_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtFontDatabaseSupport/private/qbasicfontdatabase_p.h>
 #include <QtCore/QLoggingCategory>
 
diff --git a/src/platformsupport/fontdatabases/winrt/winrt.pri b/src/platformsupport/fontdatabases/winrt/winrt.pri
new file mode 100644
index 0000000000..4875338182
--- /dev/null
+++ b/src/platformsupport/fontdatabases/winrt/winrt.pri
@@ -0,0 +1,11 @@
+QT *= gui-private
+
+SOURCES += \
+    $$PWD/qwinrtfontdatabase.cpp
+
+HEADERS += \
+    $$PWD/qwinrtfontdatabase_p.h
+
+DEFINES += __WRL_NO_DEFAULT_LIB__
+
+LIBS += $$QMAKE_LIBS_CORE -ldwrite
diff --git a/src/plugins/platforms/winrt/qwinrtintegration.cpp b/src/plugins/platforms/winrt/qwinrtintegration.cpp
index 7a0c95e6c1..ffc3bbf077 100644
--- a/src/plugins/platforms/winrt/qwinrtintegration.cpp
+++ b/src/plugins/platforms/winrt/qwinrtintegration.cpp
@@ -45,7 +45,6 @@
 #include "qwinrtinputcontext.h"
 #include "qwinrtservices.h"
 #include "qwinrteglcontext.h"
-#include "qwinrtfontdatabase.h"
 #include "qwinrttheme.h"
 #include "qwinrtclipboard.h"
 #ifndef QT_NO_DRAGANDDROP
@@ -56,6 +55,7 @@
 #include <QtGui/QOpenGLContext>
 #include <QtGui/QSurface>
 
+#include <QtFontDatabaseSupport/private/qwinrtfontdatabase_p.h>
 #include <QtEglSupport/private/qeglpbuffer_p.h>
 #include <qpa/qwindowsysteminterface.h>
 #include <qpa/qplatformwindow.h>
diff --git a/src/plugins/platforms/winrt/winrt.pro b/src/plugins/platforms/winrt/winrt.pro
index 8fd2a83a16..be2f5ca7e2 100644
--- a/src/plugins/platforms/winrt/winrt.pro
+++ b/src/plugins/platforms/winrt/winrt.pro
@@ -8,7 +8,7 @@ QT += \
 
 DEFINES *= QT_NO_CAST_FROM_ASCII __WRL_NO_DEFAULT_LIB__
 
-LIBS += $$QMAKE_LIBS_CORE -ldwrite -ld3d11
+LIBS += $$QMAKE_LIBS_CORE -ld3d11
 
 SOURCES = \
     main.cpp  \
@@ -20,7 +20,6 @@ SOURCES = \
     qwinrteventdispatcher.cpp \
     qwinrtfiledialoghelper.cpp \
     qwinrtfileengine.cpp \
-    qwinrtfontdatabase.cpp \
     qwinrtinputcontext.cpp \
     qwinrtintegration.cpp \
     qwinrtmessagedialoghelper.cpp \
@@ -39,7 +38,6 @@ HEADERS = \
     qwinrteventdispatcher.h \
     qwinrtfiledialoghelper.h \
     qwinrtfileengine.h \
-    qwinrtfontdatabase.h \
     qwinrtinputcontext.h \
     qwinrtintegration.h \
     qwinrtmessagedialoghelper.h \