From 08dc547c859d6446d4bb589b50e0feccbffc7c9f Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 11 May 2017 12:48:55 +0200 Subject: Default: pass busy indicator and progress bar colors from QML Default.textColor (also used in eg. RangeSlider to fill the range) is equal to the color that was previously hard-coded in qquickdefaultbusyindicator.cpp and qquickdefaultprogressbar.cpp. Change-Id: I8f0749862def31667b6ef2ab3b4c6ea71a590755 Reviewed-by: Mitch Curtis --- src/imports/controls/qquickdefaultbusyindicator_p.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/imports/controls/qquickdefaultbusyindicator_p.h') diff --git a/src/imports/controls/qquickdefaultbusyindicator_p.h b/src/imports/controls/qquickdefaultbusyindicator_p.h index 7daeabd1..3bbd6c31 100644 --- a/src/imports/controls/qquickdefaultbusyindicator_p.h +++ b/src/imports/controls/qquickdefaultbusyindicator_p.h @@ -55,10 +55,14 @@ QT_BEGIN_NAMESPACE class QQuickDefaultBusyIndicator : public QQuickItem { Q_OBJECT + Q_PROPERTY(QColor color READ color WRITE setColor FINAL) public: explicit QQuickDefaultBusyIndicator(QQuickItem *parent = nullptr); + QColor color() const; + void setColor(const QColor &color); + int elapsed() const; protected: @@ -67,6 +71,7 @@ protected: private: int m_elapsed; + QColor m_color; }; QT_END_NAMESPACE -- cgit v1.2.3