diff options
| author | Jaakko Korpela <jaakko.korpela@nokia.com> | 2012-03-14 12:27:04 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-15 09:13:38 +0100 |
| commit | e4f98299079142fb0cacd1ee46c281da0c07300b (patch) | |
| tree | dfb3492ab3bd4bb571b9cb891e9d648b61dbd3cb /src | |
| parent | 172635fa17fd2fa141f099ba031058477a326dde (diff) | |
Fix compare logic in setting HapticsEffect intensities.
New intensity value is set if the compared values differ,
not when they are the same. Update the autotest as well
with HapticEffect value update tests.
Change-Id: Ic24ef4307f4e4f17f38c4a45ed348e43aece4735
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/feedback/qdeclarativehapticseffect.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/feedback/qdeclarativehapticseffect.cpp b/src/imports/feedback/qdeclarativehapticseffect.cpp index 596693b..a32d43b 100644 --- a/src/imports/feedback/qdeclarativehapticseffect.cpp +++ b/src/imports/feedback/qdeclarativehapticseffect.cpp @@ -90,7 +90,7 @@ int QDeclarativeHapticsEffect::duration() const */ void QDeclarativeHapticsEffect::setIntensity(qreal intensity) { - if (qFuzzyCompare(intensity, d->intensity())) { + if (!qFuzzyCompare(intensity, d->intensity())) { d->setIntensity(intensity); emit intensityChanged(); } @@ -126,7 +126,7 @@ int QDeclarativeHapticsEffect::attackTime() const */ void QDeclarativeHapticsEffect::setAttackIntensity(qreal intensity) { - if (qFuzzyCompare(intensity, d->attackIntensity())) { + if (!qFuzzyCompare(intensity, d->attackIntensity())) { d->setAttackIntensity(intensity); emit intensityChanged(); } @@ -157,7 +157,7 @@ int QDeclarativeHapticsEffect::fadeTime() const void QDeclarativeHapticsEffect::setFadeIntensity(qreal intensity) { - if (qFuzzyCompare(intensity, d->fadeIntensity())) { + if (!qFuzzyCompare(intensity, d->fadeIntensity())) { d->setFadeIntensity(intensity); emit fadeIntensityChanged(); } |