diff options
Diffstat (limited to 'src/imports/controls/universal/qquickuniversalprogressstrip_p.h')
| -rw-r--r-- | src/imports/controls/universal/qquickuniversalprogressstrip_p.h | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/src/imports/controls/universal/qquickuniversalprogressstrip_p.h b/src/imports/controls/universal/qquickuniversalprogressstrip_p.h index b61e73c6..89350e4d 100644 --- a/src/imports/controls/universal/qquickuniversalprogressstrip_p.h +++ b/src/imports/controls/universal/qquickuniversalprogressstrip_p.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2016 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -56,22 +56,29 @@ QT_BEGIN_NAMESPACE class QQuickUniversalProgressStrip : public QQuickItem { Q_OBJECT - Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged FINAL) + Q_PROPERTY(QColor color READ color WRITE setColor FINAL) + Q_PROPERTY(qreal progress READ progress WRITE setProgress FINAL) + Q_PROPERTY(bool indeterminate READ isIndeterminate WRITE setIndeterminate FINAL) public: - QQuickUniversalProgressStrip(QQuickItem *parent = Q_NULLPTR); + QQuickUniversalProgressStrip(QQuickItem *parent = nullptr); QColor color() const; void setColor(const QColor &color); -Q_SIGNALS: - void colorChanged(); + qreal progress() const; + void setProgress(qreal progress); + + bool isIndeterminate() const; + void setIndeterminate(bool indeterminate); protected: - QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) Q_DECL_OVERRIDE; + QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) override; private: QColor m_color; + qreal m_progress; + bool m_indeterminate; }; class QQuickUniversalProgressStripAnimator : public QQuickAnimator @@ -79,11 +86,11 @@ class QQuickUniversalProgressStripAnimator : public QQuickAnimator Q_OBJECT public: - QQuickUniversalProgressStripAnimator(QObject *parent = Q_NULLPTR); + QQuickUniversalProgressStripAnimator(QObject *parent = nullptr); protected: - QString propertyName() const Q_DECL_OVERRIDE; - QQuickAnimatorJob *createJob() const Q_DECL_OVERRIDE; + QString propertyName() const override; + QQuickAnimatorJob *createJob() const override; }; QT_END_NAMESPACE |