Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6

3 files changed, 110 insertions, 0 deletions

diff --git a/tests/benchmarks/plugins/imageformats/jpeg/jpeg.cpp b/tests/benchmarks/plugins/imageformats/jpeg/jpeg.cpp
new file mode 100644
index 0000000..2cb9421
--- /dev/null
+++ b/tests/benchmarks/plugins/imageformats/jpeg/jpeg.cpp
@@ -0,0 +1,92 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** 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.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QDebug>
+#include <qtest.h>
+#include <QtTest/QtTest>
+#include <QFile>
+#include <QByteArray>
+#include <QBuffer>
+#include <QImageReader>
+#include <QSize>
+
+#if defined(Q_OS_SYMBIAN)
+# define SRCDIR ""
+#endif
+
+class tst_jpeg : public QObject
+{
+    Q_OBJECT
+private slots:
+    void jpegDecodingQtWebkitStyle();
+};
+
+void tst_jpeg::jpegDecodingQtWebkitStyle()
+{
+    // QtWebkit currently calls size() to get the image size for layouting purposes.
+    // Then when it is in the viewport (we assume that here) it actually gets decoded.
+    QFile inputJpeg(SRCDIR "n900.jpeg");
+    QVERIFY(inputJpeg.exists());
+    inputJpeg.open(QIODevice::ReadOnly);
+    QByteArray imageData = inputJpeg.readAll();
+    QBuffer buffer;
+    buffer.setData(imageData);
+    buffer.open(QBuffer::ReadOnly);
+    QCOMPARE(buffer.size(), qint64(19016));
+
+
+    QBENCHMARK{
+        for (int i = 0; i < 50; i++) {
+            QImageReader reader(&buffer, "jpeg");
+            QSize size = reader.size();
+            QVERIFY(!size.isNull());
+            QByteArray format = reader.format();
+            QVERIFY(!format.isEmpty());
+            QImage img = reader.read();
+            QVERIFY(!img.isNull());
+            buffer.reset();
+        }
+    }
+}
+
+QTEST_MAIN(tst_jpeg)
+
+#include "jpeg.moc"
diff --git a/tests/benchmarks/plugins/imageformats/jpeg/jpeg.pro b/tests/benchmarks/plugins/imageformats/jpeg/jpeg.pro
new file mode 100644
index 0000000..e106f3e
--- /dev/null
+++ b/tests/benchmarks/plugins/imageformats/jpeg/jpeg.pro
@@ -0,0 +1,18 @@
+load(qttest_p4)
+TEMPLATE = app
+TARGET = jpeg
+DEPENDPATH += .
+INCLUDEPATH += .
+
+CONFIG += release
+
+wince*: {
+   DEFINES += SRCDIR=\\\"\\\"
+} else:symbian {
+   # SRCDIR and SVGFILE defined in code in symbian
+}else {
+   DEFINES += SRCDIR=\\\"$$PWD/\\\"
+}
+
+# Input
+SOURCES += jpeg.cpp
diff --git a/tests/benchmarks/plugins/imageformats/jpeg/n900.jpeg b/tests/benchmarks/plugins/imageformats/jpeg/n900.jpeg
new file mode 100644
index 0000000..681989a
--- /dev/null
+++ b/tests/benchmarks/plugins/imageformats/jpeg/n900.jpeg