diff options
Diffstat (limited to 'src/quick/items/qquickitemview_p.h')
| -rw-r--r-- | src/quick/items/qquickitemview_p.h | 62 |
1 files changed, 16 insertions, 46 deletions
diff --git a/src/quick/items/qquickitemview_p.h b/src/quick/items/qquickitemview_p.h index f05618579a..cecbf094cb 100644 --- a/src/quick/items/qquickitemview_p.h +++ b/src/quick/items/qquickitemview_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 QQUICKITEMVIEW_P_H #define QQUICKITEMVIEW_P_H @@ -67,7 +31,7 @@ class QQmlChangeSet; class QQuickItemViewPrivate; -class Q_QUICK_PRIVATE_EXPORT QQuickItemView : public QQuickFlickable +class Q_QUICK_EXPORT QQuickItemView : public QQuickFlickable { Q_OBJECT @@ -93,6 +57,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickItemView : public QQuickFlickable Q_PROPERTY(QQmlComponent *footer READ footer WRITE setFooter NOTIFY footerChanged) Q_PROPERTY(QQuickItem *footerItem READ footerItem NOTIFY footerItemChanged) +#if QT_CONFIG(quick_viewtransitions) Q_PROPERTY(QQuickTransition *populate READ populateTransition WRITE setPopulateTransition NOTIFY populateTransitionChanged) Q_PROPERTY(QQuickTransition *add READ addTransition WRITE setAddTransition NOTIFY addTransitionChanged) Q_PROPERTY(QQuickTransition *addDisplaced READ addDisplacedTransition WRITE setAddDisplacedTransition NOTIFY addDisplacedTransitionChanged) @@ -101,6 +66,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickItemView : public QQuickFlickable Q_PROPERTY(QQuickTransition *remove READ removeTransition WRITE setRemoveTransition NOTIFY removeTransitionChanged) Q_PROPERTY(QQuickTransition *removeDisplaced READ removeDisplacedTransition WRITE setRemoveDisplacedTransition NOTIFY removeDisplacedTransitionChanged) Q_PROPERTY(QQuickTransition *displaced READ displacedTransition WRITE setDisplacedTransition NOTIFY displacedTransitionChanged) +#endif Q_PROPERTY(QQmlComponent *highlight READ highlight WRITE setHighlight NOTIFY highlightChanged) Q_PROPERTY(QQuickItem *highlightItem READ highlightItem NOTIFY highlightItemChanged) @@ -180,6 +146,7 @@ public: void setHeader(QQmlComponent *); QQuickItem *headerItem() const; +#if QT_CONFIG(quick_viewtransitions) QQuickTransition *populateTransition() const; void setPopulateTransition(QQuickTransition *transition); @@ -203,6 +170,7 @@ public: QQuickTransition *displacedTransition() const; void setDisplacedTransition(QQuickTransition *transition); +#endif QQmlComponent *highlight() const; void setHighlight(QQmlComponent *); @@ -269,6 +237,7 @@ Q_SIGNALS: void headerItemChanged(); void footerItemChanged(); +#if QT_CONFIG(quick_viewtransitions) void populateTransitionChanged(); void addTransitionChanged(); void addDisplacedTransitionChanged(); @@ -277,6 +246,7 @@ Q_SIGNALS: void removeTransitionChanged(); void removeDisplacedTransitionChanged(); void displacedTransitionChanged(); +#endif void highlightChanged(); void highlightItemChanged(); @@ -313,17 +283,17 @@ private: }; -class Q_QUICK_PRIVATE_EXPORT QQuickItemViewAttached : public QObject +class Q_QUICK_EXPORT QQuickItemViewAttached : public QObject { Q_OBJECT - Q_PROPERTY(QQuickItemView *view READ view NOTIFY viewChanged) - Q_PROPERTY(bool isCurrentItem READ isCurrentItem NOTIFY currentItemChanged) - Q_PROPERTY(bool delayRemove READ delayRemove WRITE setDelayRemove NOTIFY delayRemoveChanged) + Q_PROPERTY(QQuickItemView *view READ view NOTIFY viewChanged FINAL) + Q_PROPERTY(bool isCurrentItem READ isCurrentItem NOTIFY currentItemChanged FINAL) + Q_PROPERTY(bool delayRemove READ delayRemove WRITE setDelayRemove NOTIFY delayRemoveChanged FINAL) - Q_PROPERTY(QString section READ section NOTIFY sectionChanged) - Q_PROPERTY(QString previousSection READ prevSection NOTIFY prevSectionChanged) - Q_PROPERTY(QString nextSection READ nextSection NOTIFY nextSectionChanged) + Q_PROPERTY(QString section READ section NOTIFY sectionChanged FINAL) + Q_PROPERTY(QString previousSection READ prevSection NOTIFY prevSectionChanged FINAL) + Q_PROPERTY(QString nextSection READ nextSection NOTIFY nextSectionChanged FINAL) public: QQuickItemViewAttached(QObject *parent) |