diff options
Diffstat (limited to 'src/quick/items/qquicktranslate_p.h')
-rw-r--r-- | src/quick/items/qquicktranslate_p.h | 67 |
1 files changed, 17 insertions, 50 deletions
diff --git a/src/quick/items/qquicktranslate_p.h b/src/quick/items/qquicktranslate_p.h index b6ea43342c..496a115d3f 100644 --- a/src/quick/items/qquicktranslate_p.h +++ b/src/quick/items/qquicktranslate_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 QQUICKTRANSLATE_P_H #define QQUICKTRANSLATE_P_H @@ -51,23 +15,26 @@ // We mean it. // -#include "qquickitem.h" +#include <private/qtquickglobal_p.h> + +#include <QtQuick/qquickitem.h> #include <QtGui/qmatrix4x4.h> QT_BEGIN_NAMESPACE class QQuickTranslatePrivate; -class Q_AUTOTEST_EXPORT QQuickTranslate : public QQuickTransform +class Q_QUICK_EXPORT QQuickTranslate : public QQuickTransform { Q_OBJECT Q_PROPERTY(qreal x READ x WRITE setX NOTIFY xChanged) Q_PROPERTY(qreal y READ y WRITE setY NOTIFY yChanged) + QML_NAMED_ELEMENT(Translate) + QML_ADDED_IN_VERSION(2, 0) public: QQuickTranslate(QObject *parent = nullptr); - ~QQuickTranslate(); qreal x() const; void setX(qreal); @@ -83,11 +50,10 @@ Q_SIGNALS: private: Q_DECLARE_PRIVATE(QQuickTranslate) - Q_DISABLE_COPY(QQuickTranslate) }; class QQuickScalePrivate; -class Q_AUTOTEST_EXPORT QQuickScale : public QQuickTransform +class Q_QUICK_EXPORT QQuickScale : public QQuickTransform { Q_OBJECT @@ -95,9 +61,10 @@ class Q_AUTOTEST_EXPORT QQuickScale : public QQuickTransform Q_PROPERTY(qreal xScale READ xScale WRITE setXScale NOTIFY xScaleChanged) Q_PROPERTY(qreal yScale READ yScale WRITE setYScale NOTIFY yScaleChanged) Q_PROPERTY(qreal zScale READ zScale WRITE setZScale NOTIFY zScaleChanged) + QML_NAMED_ELEMENT(Scale) + QML_ADDED_IN_VERSION(2, 0) public: QQuickScale(QObject *parent = nullptr); - ~QQuickScale(); QVector3D origin() const; void setOrigin(const QVector3D &point); @@ -125,16 +92,17 @@ private: }; class QQuickRotationPrivate; -class Q_AUTOTEST_EXPORT QQuickRotation : public QQuickTransform +class Q_QUICK_EXPORT QQuickRotation : public QQuickTransform { Q_OBJECT Q_PROPERTY(QVector3D origin READ origin WRITE setOrigin NOTIFY originChanged) Q_PROPERTY(qreal angle READ angle WRITE setAngle NOTIFY angleChanged) Q_PROPERTY(QVector3D axis READ axis WRITE setAxis NOTIFY axisChanged) + QML_NAMED_ELEMENT(Rotation) + QML_ADDED_IN_VERSION(2, 0) public: QQuickRotation(QObject *parent = nullptr); - ~QQuickRotation(); QVector3D origin() const; void setOrigin(const QVector3D &point); @@ -158,14 +126,15 @@ private: }; class QQuickMatrix4x4Private; -class Q_AUTOTEST_EXPORT QQuickMatrix4x4 : public QQuickTransform +class Q_QUICK_EXPORT QQuickMatrix4x4 : public QQuickTransform { Q_OBJECT Q_PROPERTY(QMatrix4x4 matrix READ matrix WRITE setMatrix NOTIFY matrixChanged) + QML_NAMED_ELEMENT(Matrix4x4) + QML_ADDED_IN_VERSION(2, 3) public: QQuickMatrix4x4(QObject *parent = nullptr); - ~QQuickMatrix4x4(); QMatrix4x4 matrix() const; void setMatrix(const QMatrix4x4& matrix); @@ -182,6 +151,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQuickTranslate) - #endif |