diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-19 03:01:14 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-19 03:01:14 +0200 |
| commit | e96bd2160c1e174c94567ccc78a5bab77f6e9865 (patch) | |
| tree | a638fe6d2f055ff9870670f8a050b4413662ea1c /src/imports/controls/material | |
| parent | 8e2d1b1efe736760d27af17160f662454546b054 (diff) | |
| parent | 0a827cdee698e7b1b3c9a4096ef7f01ad9d9d32e (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I770f99d20878ddf16ab3f4b1a5422e7192622f64
Diffstat (limited to 'src/imports/controls/material')
| -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); |