diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-12 07:38:54 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-15 11:34:26 +0200 |
commit | 6be9830d865be32f224e15d13ddefd9c7e176553 (patch) | |
tree | 8938ff202f53f3ad0f4e8facee84f0acdf9af093 /src/platformsupport/fontdatabases/genericunix | |
parent | 927a82f5e0d0e8a174cbb027c58412e13f7067c5 (diff) |
Move Unix font databases into QtGui
Task-number: QTBUG-83255
Change-Id: Id85a1e0f3de371951783fe97485158c4a02e1f15
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/platformsupport/fontdatabases/genericunix')
-rw-r--r-- | src/platformsupport/fontdatabases/genericunix/genericunix.pri | 1 | ||||
-rw-r--r-- | src/platformsupport/fontdatabases/genericunix/qgenericunixfontdatabase_p.h | 64 |
2 files changed, 0 insertions, 65 deletions
diff --git a/src/platformsupport/fontdatabases/genericunix/genericunix.pri b/src/platformsupport/fontdatabases/genericunix/genericunix.pri deleted file mode 100644 index e9db6c07e2..0000000000 --- a/src/platformsupport/fontdatabases/genericunix/genericunix.pri +++ /dev/null @@ -1 +0,0 @@ -HEADERS += $$PWD/qgenericunixfontdatabase_p.h diff --git a/src/platformsupport/fontdatabases/genericunix/qgenericunixfontdatabase_p.h b/src/platformsupport/fontdatabases/genericunix/qgenericunixfontdatabase_p.h deleted file mode 100644 index c5be0e7345..0000000000 --- a/src/platformsupport/fontdatabases/genericunix/qgenericunixfontdatabase_p.h +++ /dev/null @@ -1,64 +0,0 @@ -/**************************************************************************** -** -** 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$ -** -****************************************************************************/ - -#ifndef QGENERICUNIXFONTDATABASE_H -#define QGENERICUNIXFONTDATABASE_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 <QtGui/private/qtguiglobal_p.h> - -#if QT_CONFIG(fontconfig) -#include <QtFontDatabaseSupport/private/qfontconfigdatabase_p.h> -typedef QFontconfigDatabase QGenericUnixFontDatabase; -#else -#include <QtGui/private/qfreetypefontdatabase_p.h> -typedef QFreeTypeFontDatabase QGenericUnixFontDatabase; -#endif //Q_FONTCONFIGDATABASE - -#endif // QGENERICUNIXFONTDATABASE_H |