diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-12 03:03:50 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-12 03:03:50 +0200 |
| commit | dd5abf8117529bfa88ac0b57bbf09920d1fc10e9 (patch) | |
| tree | f0c174c4f3805c414ee7683cce8234bd3db089af /src/imports/controls | |
| parent | a4ecc76df944cce5152cdfc8fd27436390a4fa62 (diff) | |
| parent | b57d78d32238fc7f7dcccb02be29aa3df3da531e (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I342393f83eab161df8ad6323051c5fadb4cf9ddc
Diffstat (limited to 'src/imports/controls')
| -rw-r--r-- | src/imports/controls/material/qquickmaterialbusyindicator.cpp | 2 | ||||
| -rw-r--r-- | src/imports/controls/material/qquickmaterialbusyindicator_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/controls/material/qquickmaterialbusyindicator.cpp b/src/imports/controls/material/qquickmaterialbusyindicator.cpp index c18a4005..58c1fd8c 100644 --- a/src/imports/controls/material/qquickmaterialbusyindicator.cpp +++ b/src/imports/controls/material/qquickmaterialbusyindicator.cpp @@ -184,7 +184,7 @@ QColor QQuickMaterialBusyIndicator::color() const return m_color; } -void QQuickMaterialBusyIndicator::setColor(QColor color) +void QQuickMaterialBusyIndicator::setColor(const QColor &color) { if (m_color == color) return; diff --git a/src/imports/controls/material/qquickmaterialbusyindicator_p.h b/src/imports/controls/material/qquickmaterialbusyindicator_p.h index d29427c1..ad7bc002 100644 --- a/src/imports/controls/material/qquickmaterialbusyindicator_p.h +++ b/src/imports/controls/material/qquickmaterialbusyindicator_p.h @@ -63,7 +63,7 @@ public: explicit QQuickMaterialBusyIndicator(QQuickItem *parent = nullptr); QColor color() const; - void setColor(QColor color); + void setColor(const QColor &color); bool isRunning() const; void setRunning(bool running); |