Move WinRT font database to QtFontDatabaseSupport
Similar to what we recently did with the Windows font databases. The goal, again, is to add platform font database support for the minimal QPA plugin. Change-Id: Ide5f4ec452c920f169cc31c617cbcf19d8d1764d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>bb10
parent
95b506cccd
commit
a192ee0c37
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include "qwinrtfontdatabase.h"
|
||||
#include "qwinrtfontdatabase_p.h"
|
||||
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtCore/QFile>
|
||||
|
|
@ -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>
|
||||
|
||||
|
|
@ -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
|
||||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
Loading…
Reference in New Issue