From e283bda8e5e5c83dcbd0f31adb3007182e72960f Mon Sep 17 00:00:00 2001 From: Sergio Martins Date: Sun, 3 May 2015 22:03:13 +0100 Subject: [PATCH] Fix unintentional no-op, unite() doesn't change the object REVIEW: 123618 --- effects/startupfeedback/startupfeedback.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/effects/startupfeedback/startupfeedback.cpp b/effects/startupfeedback/startupfeedback.cpp index 3b82fdf96c..4084441156 100644 --- a/effects/startupfeedback/startupfeedback.cpp +++ b/effects/startupfeedback/startupfeedback.cpp @@ -155,7 +155,7 @@ void StartupFeedbackEffect::prePaintScreen(ScreenPrePaintData& data, int time) m_progress = (m_progress + time) % BOUNCE_DURATION; m_frame = qRound((qreal)m_progress / (qreal)BOUNCE_FRAME_DURATION) % BOUNCE_FRAMES; m_currentGeometry = feedbackRect(); // bounce alters geometry with m_frame - data.paint.unite(m_currentGeometry); + data.paint = data.paint.united(m_currentGeometry); break; case BlinkingFeedback: m_progress = (m_progress + time) % BLINKING_DURATION;