diff options
Diffstat (limited to 'src/gui/text/coretext/qcoretextfontdatabase_p.h')
-rw-r--r-- | src/gui/text/coretext/qcoretextfontdatabase_p.h | 62 |
1 files changed, 15 insertions, 47 deletions
diff --git a/src/gui/text/coretext/qcoretextfontdatabase_p.h b/src/gui/text/coretext/qcoretextfontdatabase_p.h index 971ac3cfde..eeea9ad640 100644 --- a/src/gui/text/coretext/qcoretextfontdatabase_p.h +++ b/src/gui/text/coretext/qcoretextfontdatabase_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QCORETEXTFONTDATABASE_H #define QCORETEXTFONTDATABASE_H @@ -60,8 +24,8 @@ Q_FORWARD_DECLARE_CF_TYPE(CTFontDescriptor); Q_FORWARD_DECLARE_CF_TYPE(CTFont); -Q_DECLARE_METATYPE(QCFType<CGFontRef>); -Q_DECLARE_METATYPE(QCFType<CFURLRef>); +QT_DECL_METATYPE_EXTERN_TAGGED(QCFType<CGFontRef>, QCFType_CGFontRef, Q_GUI_EXPORT) +QT_DECL_METATYPE_EXTERN_TAGGED(QCFType<CFURLRef>, QCFType_CFURLRef, Q_GUI_EXPORT) QT_BEGIN_NAMESPACE @@ -82,22 +46,26 @@ public: QFont defaultFont() const override; bool fontsAlwaysScalable() const override; QList<int> standardSizes() const override; + bool supportsVariableApplicationFonts() const override; - // For iOS and OS X platform themes + // For iOS and macOS platform themes QFont *themeFont(QPlatformTheme::Font) const; - const QHash<QPlatformTheme::Font, QFont *> &themeFonts() const; - -protected: - mutable QSet<CTFontDescriptorRef> m_systemFontDescriptors; private: + void populateThemeFonts(); void populateFromDescriptor(CTFontDescriptorRef font, const QString &familyName = QString(), QFontDatabasePrivate::ApplicationFont *applicationFont = nullptr); static CFArrayRef fallbacksForFamily(const QString &family); - mutable QString defaultFontName; + QHash<QPlatformTheme::Font, QFont *> m_themeFonts; + QHash<QString, QList<QCFType<CTFontDescriptorRef>>> m_systemFontDescriptors; + QHash<QChar::Script, QString> m_hardcodedFallbackFonts; + mutable QSet<QString> m_privateFamilies; - mutable QHash<QPlatformTheme::Font, QFont *> m_themeFonts; bool m_hasPopulatedAliases; + +#if defined(Q_OS_MACOS) + QMacNotificationObserver m_fontSetObserver; +#endif }; // Split out into separate template class so that the compiler doesn't have |