diff options
Diffstat (limited to 'src/quick/util/qquickfontmetrics_p.h')
| -rw-r--r-- | src/quick/util/qquickfontmetrics_p.h | 54 |
1 files changed, 9 insertions, 45 deletions
diff --git a/src/quick/util/qquickfontmetrics_p.h b/src/quick/util/qquickfontmetrics_p.h index 59f4aa8355..a4ebf5cbf7 100644 --- a/src/quick/util/qquickfontmetrics_p.h +++ b/src/quick/util/qquickfontmetrics_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 QtQuick module 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 QQUICKFONTMETRICS_H #define QQUICKFONTMETRICS_H @@ -51,16 +15,19 @@ // We mean it. // -#include <qqml.h> +#include <private/qtquickglobal_p.h> -#include <QtGui/QFontMetricsF> -#include <QtCore/QObject> +#include <QtQml/qqml.h> + +#include <QtGui/qfontmetrics.h> + +#include <QtCore/qobject.h> QT_BEGIN_NAMESPACE class QFont; -class Q_AUTOTEST_EXPORT QQuickFontMetrics : public QObject +class Q_QUICK_EXPORT QQuickFontMetrics : public QObject { Q_OBJECT @@ -83,7 +50,6 @@ class Q_AUTOTEST_EXPORT QQuickFontMetrics : public QObject QML_ADDED_IN_VERSION(2, 4) public: explicit QQuickFontMetrics(QObject *parent = nullptr); - ~QQuickFontMetrics(); QFont font() const; void setFont(const QFont &font); @@ -120,6 +86,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickFontMetrics) - #endif // QQUICKFONTMETRICS_H |