Changeset 846 for trunk/src/gui/effects

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/effects/qgraphicseffect.cpp (modified) (3 diffs)
• src/gui/effects/qgraphicseffect.h (modified) (1 diff)
• src/gui/effects/qgraphicseffect_p.h (modified) (1 diff)

trunk/src/gui/effects/qgraphicseffect.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -327 +327 @@
 
     QPixmap pm;
-    if (d->m_cachedSystem == system && d->m_cachedMode == mode)
+    if (item && d->m_cachedSystem == system && d->m_cachedMode == mode)
         QPixmapCache::find(d->m_cacheKey, &pm);
 
@@ -489 +489 @@
 
 /*!
-    Schedules a redraw of the source. Call this function whenever the source
-    needs to be redrawn.
-
-    This convenience function is equivalent to calling
-    QGraphicsEffectSource::update().
-
-    \sa updateBoundingRect(), QGraphicsEffectSource::update()
+    Schedules a redraw of the effect. Call this function whenever the effect
+    needs to be redrawn. This function does not trigger a redraw of the source.
+
+    \sa updateBoundingRect()
 */
 void QGraphicsEffect::update()

trunk/src/gui/effects/qgraphicseffect.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/effects/qgraphicseffect_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)