aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-04-25 18:59:27 +0200
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-04-27 16:09:32 +0000
commit1590f21ad105b239f129d52b5eebd14f23b926bb (patch)
treeaffc8a5ab80f3bf41257a94fb098b9d657814dd0
parent183798bf9512171f6b68aa2d9c6642f4d1501331 (diff)
Set BusyIndicator::running to true by default
This way it works out of the box and can be used with visible true/false etc. It's also in line with what qtquickcontrols (1) do. Change-Id: Ib82b0a60a7a78b6646452704f4ffb96fbd16923c Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
-rw-r--r--src/controls/qquickbusyindicator.cpp2
-rw-r--r--tests/auto/controls/data/tst_busyindicator.qml4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/controls/qquickbusyindicator.cpp b/src/controls/qquickbusyindicator.cpp
index 8e0faf0c..ef7320ac 100644
--- a/src/controls/qquickbusyindicator.cpp
+++ b/src/controls/qquickbusyindicator.cpp
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
class QQuickBusyIndicatorPrivate : public QQuickControlPrivate
{
public:
- QQuickBusyIndicatorPrivate() : running(false), indicator(Q_NULLPTR) { }
+ QQuickBusyIndicatorPrivate() : running(true), indicator(Q_NULLPTR) { }
bool running;
QQuickItem *indicator;
diff --git a/tests/auto/controls/data/tst_busyindicator.qml b/tests/auto/controls/data/tst_busyindicator.qml
index e4f07a8a..66628a24 100644
--- a/tests/auto/controls/data/tst_busyindicator.qml
+++ b/tests/auto/controls/data/tst_busyindicator.qml
@@ -57,9 +57,9 @@ TestCase {
function test_running() {
var control = busyIndicator.createObject(testCase)
- compare(control.running, false)
- control.running = true
compare(control.running, true)
+ control.running = false
+ compare(control.running, false)
control.destroy()
}
}