aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/BusyIndicator.qml
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-05-11 12:48:55 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2017-05-12 07:54:34 +0000
commit08dc547c859d6446d4bb589b50e0feccbffc7c9f (patch)
treee94235acea80d81d33cff1817ca6e7f4c8e73b25 /src/imports/controls/BusyIndicator.qml
parent910f9d6930fdd739e9490fa491986d74b6a57975 (diff)
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 <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/BusyIndicator.qml')
-rw-r--r--src/imports/controls/BusyIndicator.qml1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/imports/controls/BusyIndicator.qml b/src/imports/controls/BusyIndicator.qml
index a645e45e..5690c71f 100644
--- a/src/imports/controls/BusyIndicator.qml
+++ b/src/imports/controls/BusyIndicator.qml
@@ -51,6 +51,7 @@ T.BusyIndicator {
implicitWidth: 48
implicitHeight: 48
+ color: Default.textColor
opacity: control.running ? 1 : 0
visible: control.running || animator.running
Behavior on opacity { OpacityAnimator { id: animator; duration: 250 } }