diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-11 14:03:47 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-11 14:03:47 +0200 |
| commit | c32c776bf4bd0bc601cb78f9814036cb40b33b52 (patch) | |
| tree | a390a1b5909c0396271be5f29b818ba114328e70 /src/quicktemplates2/qquickdelaybutton.cpp | |
| parent | 4997773a6ed0ea9908cd67ab0335d2ae177a6320 (diff) | |
| parent | d3aef722da533c3b100ba653498c79986a44c9f9 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/quicktemplates2/qquicklabel.cpp
src/quicktemplates2/qquicktextarea.cpp
src/quicktemplates2/qquicktextfield.cpp
Change-Id: Ibbf6bc48972f58fbc6779a87ac9e2434c56c4db8
Diffstat (limited to 'src/quicktemplates2/qquickdelaybutton.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickdelaybutton.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quicktemplates2/qquickdelaybutton.cpp b/src/quicktemplates2/qquickdelaybutton.cpp index 6e0baf56..128f0c78 100644 --- a/src/quicktemplates2/qquickdelaybutton.cpp +++ b/src/quicktemplates2/qquickdelaybutton.cpp @@ -125,7 +125,7 @@ void QQuickDelayTransitionManager::transition(QQuickTransition *transition, qrea void QQuickDelayTransitionManager::finished() { - if (qFuzzyCompare(m_button->progress(), 1.0)) + if (qFuzzyCompare(m_button->progress(), qreal(1.0))) emit m_button->activated(); } @@ -154,7 +154,7 @@ void QQuickDelayButtonPrivate::beginTransition(qreal to) void QQuickDelayButtonPrivate::finishTransition() { Q_Q(QQuickDelayButton); - if (qFuzzyCompare(progress, 1.0)) + if (qFuzzyCompare(progress, qreal(1.0))) emit q->activated(); } @@ -260,7 +260,7 @@ void QQuickDelayButton::buttonChange(ButtonChange change) void QQuickDelayButton::nextCheckState() { Q_D(QQuickDelayButton); - setChecked(!d->checked && qFuzzyCompare(d->progress, 1.0)); + setChecked(!d->checked && qFuzzyCompare(d->progress, qreal(1.0))); } QFont QQuickDelayButton::defaultFont() const |