Changeset 561 for trunk/src/gui/image/qmovie.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/image/qmovie.cpp (modified) (5 diffs)

trunk/src/gui/image/qmovie.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -46 +46 @@
     with QImageReader.
 
-    \ingroup multimedia
+    \ingroup painting
+
+    This class is used to show simple animations without sound. If you want
+    to display video and media content, use the \l{Phonon Module}{Phonon}
+    multimedia framework instead.
 
     First, create a QMovie object by passing either the name of a file or a
@@ -357 +361 @@
                     else
                         reader = new QImageReader(absoluteFilePath, format);
-                    reader->canRead(); // Provoke a device->open() call
+                    reader->canRead(); // Provoke a device->open() call
                     reader->device()->seek(initialDevicePos);
                     reader->setBackgroundColor(bgColor);