diff --git a/src/gui/image/qmovie.cpp b/src/gui/image/qmovie.cpp
index f5fdc2a0ea..435f1dced9 100644
--- a/src/gui/image/qmovie.cpp
+++ b/src/gui/image/qmovie.cpp
@@ -449,11 +449,7 @@ bool QMoviePrivate::next()
     }
     // Image and delay OK, update internal state
     currentFrameNumber = nextFrameNumber++;
-    QSize scaledSize = reader->scaledSize();
-    if (scaledSize.isValid() && (scaledSize != info.pixmap.size()))
-        currentPixmap = QPixmap::fromImage( info.pixmap.toImage().scaled(scaledSize) );
-    else
-        currentPixmap = info.pixmap;
+    currentPixmap = info.pixmap;
 
     if (!speed)
         return true;
diff --git a/tests/auto/gui/image/qmovie/tst_qmovie.cpp b/tests/auto/gui/image/qmovie/tst_qmovie.cpp
index fc81063281..c2171d4209 100644
--- a/tests/auto/gui/image/qmovie/tst_qmovie.cpp
+++ b/tests/auto/gui/image/qmovie/tst_qmovie.cpp
@@ -46,6 +46,9 @@ private slots:
 #ifndef QT_NO_ICO
     void multiFrameImage();
 #endif
+
+    void setScaledSize_data();
+    void setScaledSize();
 };
 
 // Testing get/set functions
@@ -289,5 +292,33 @@ void tst_QMovie::multiFrameImage()
 }
 #endif
 
+void tst_QMovie::setScaledSize_data()
+{
+    QTest::addColumn<QString>("fileName");
+    QTest::addColumn<QSize>("scaledSize");
+    QTest::addColumn<QSize>("expectedSize");
+
+    QTest::newRow("trolltech (50, 50)") << QString("animations/trolltech.gif") << QSize(50, 50) << QSize(50, 50);
+    QTest::newRow("trolltech (400, 400)") << QString("animations/trolltech.gif") << QSize(400, 400) << QSize(400, 400);
+    QTest::newRow("trolltech (50, 0)") << QString("animations/trolltech.gif") << QSize(50, 0) << QSize(50, 25);
+    QTest::newRow("trolltech (50, -1)") << QString("animations/trolltech.gif") << QSize(50, -1) << QSize(50, 25);
+    QTest::newRow("trolltech (0, 50)") << QString("animations/trolltech.gif") << QSize(0, 50) << QSize(100, 50);
+    QTest::newRow("trolltech (-1, 50)") << QString("animations/trolltech.gif") << QSize(-1, 50) << QSize(100, 50);
+}
+
+void tst_QMovie::setScaledSize()
+{
+    QFETCH(QString, fileName);
+    QFETCH(QSize, scaledSize);
+    QFETCH(QSize, expectedSize);
+
+    QMovie movie(QFINDTESTDATA(fileName));
+    movie.setScaledSize(scaledSize);
+
+    movie.start();
+    QCOMPARE(movie.currentFrameNumber(), 0);
+    QCOMPARE(movie.currentImage().size(), expectedSize);
+}
+
 QTEST_MAIN(tst_QMovie)
 #include "tst_qmovie.moc"