Fixed compile of QtPlatformSupport with -qtnamespace.
Change-Id: Iba411d35abe85ecf29a44d99113954a0561ae286 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com> Reviewed-by: hjk <qthjk@ovi.com>bb10
parent
a068e707af
commit
944b799944
|
|
@ -68,6 +68,8 @@
|
|||
#define JapaneseCsbBit 17
|
||||
#define KoreanCsbBit 21
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
static inline bool requiresOpenType(int writingSystem)
|
||||
{
|
||||
return ((writingSystem >= QFontDatabase::Syriac && writingSystem <= QFontDatabase::Sinhala)
|
||||
|
|
@ -734,3 +736,5 @@ QFont QFontconfigDatabase::defaultFont() const
|
|||
{
|
||||
return QFont(resolveFontFamilyAlias(QString()));
|
||||
}
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
|
|
|||
|
|
@ -45,6 +45,8 @@
|
|||
#include <QPlatformFontDatabase>
|
||||
#include <QtPlatformSupport/private/qbasicfontdatabase_p.h>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
class QFontconfigDatabase : public QBasicFontDatabase
|
||||
{
|
||||
public:
|
||||
|
|
@ -56,4 +58,6 @@ public:
|
|||
QFont defaultFont() const;
|
||||
};
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#endif // QFONTCONFIGDATABASE_H
|
||||
|
|
|
|||
Loading…
Reference in New Issue