diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-22 03:01:37 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-22 03:01:37 +0200 |
commit | 82a4e7917b04d620a10ddc19df3bbc5b5f84c598 (patch) | |
tree | 72bace43a5d02e8278c436ff34fbfe83a0a41cb5 | |
parent | 8a90e8964818b117cbfd04943c36cacb849372b2 (diff) | |
parent | 588dbd7a680538d7880fdd5259a3c12a88338a85 (diff) | |
download | qtsvg-82a4e7917b04d620a10ddc19df3bbc5b5f84c598.tar.gz |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I6470dad844a85fb57cd24b54614b984bfd82859a
-rw-r--r-- | examples/svg/network/bearercloud/bearercloud.cpp | 2 | ||||
-rw-r--r-- | examples/svg/network/bearercloud/cloud.cpp | 2 | ||||
-rw-r--r-- | examples/svg/network/bearercloud/cloud.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/svg/network/bearercloud/bearercloud.cpp b/examples/svg/network/bearercloud/bearercloud.cpp index 610764a..0f08aec 100644 --- a/examples/svg/network/bearercloud/bearercloud.cpp +++ b/examples/svg/network/bearercloud/bearercloud.cpp @@ -131,7 +131,7 @@ void BearerCloud::timerEvent(QTimerEvent *) bool cloudsMoved = false; for (Cloud *cloud : clouds) - cloudsMoved |= cloud->advance(); + cloudsMoved |= cloud->advanceAnimation(); if (!cloudsMoved) { killTimer(timerId); diff --git a/examples/svg/network/bearercloud/cloud.cpp b/examples/svg/network/bearercloud/cloud.cpp index 43f6379..4e0313a 100644 --- a/examples/svg/network/bearercloud/cloud.cpp +++ b/examples/svg/network/bearercloud/cloud.cpp @@ -170,7 +170,7 @@ void Cloud::calculateForces() newPos.setY(qMin(qMax(newPos.y(), sceneRect.top() + 10), sceneRect.bottom() - 10)); } -bool Cloud::advance() +bool Cloud::advanceAnimation() { static const qreal scaleDelta = 0.01; diff --git a/examples/svg/network/bearercloud/cloud.h b/examples/svg/network/bearercloud/cloud.h index 2a728d1..a91b994 100644 --- a/examples/svg/network/bearercloud/cloud.h +++ b/examples/svg/network/bearercloud/cloud.h @@ -76,7 +76,7 @@ public: void calculateForces(); - bool advance(); + bool advanceAnimation(); QRectF boundingRect() const override; void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) override; |