diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2013-01-15 10:48:37 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-15 14:58:35 +0100 |
| commit | 3a1f1aecf9b4ef05fd162cd60e06214dc28922b6 (patch) | |
| tree | 8e4f509b2c32ad1e99a6988fcf90ee2f9a25fa0f | |
| parent | 7818eaf2b1129061e1cbbaf3e91517397b135cdd (diff) | |
QStyleAnimation: remove obsolete workaround for threaded rendering
This is a partial revert of 7abf623. The desktop components have been
fixed to call QStyle in the main GUI thread.
Change-Id: Ifd8364269b7d2e350f34647c128ff2fbde70afd6
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
| -rw-r--r-- | src/widgets/styles/qstyleanimation.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/widgets/styles/qstyleanimation.cpp b/src/widgets/styles/qstyleanimation.cpp index 9ddcbcc511..64cb23ca6d 100644 --- a/src/widgets/styles/qstyleanimation.cpp +++ b/src/widgets/styles/qstyleanimation.cpp @@ -46,13 +46,9 @@ QT_BEGIN_NAMESPACE -QStyleAnimation::QStyleAnimation(QObject *target) : QAbstractAnimation(), +QStyleAnimation::QStyleAnimation(QObject *target) : QAbstractAnimation(target), _delay(0), _duration(-1), _startTime(QTime::currentTime()) { - if (target) { - moveToThread(target->thread()); - setParent(target); - } connect(this, SIGNAL(finished()), SLOT(deleteLater())); } |