From 3a1f1aecf9b4ef05fd162cd60e06214dc28922b6 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 15 Jan 2013 10:48:37 +0100 Subject: [PATCH] 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 --- src/widgets/styles/qstyleanimation.cpp | 6 +----- 1 file changed, 1 insertion(+), 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())); }