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

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (24 commits)
  Fixed usage of QGLPixelBuffer with share widgets on other X11 screens.
  Fixed drawing QPixmaps on QGLWidgets on different X11 screens.
  Fixed drawing pixmaps onto bitmaps on X11 w/o Xrender support.
  Prevented assert when using drop shadow effect in the GL 2 engine.
  Clarify QFont::rawName() docs.
  Stabilize QListView test on Mac
  (ODBC) Use wchar_t instead of assuming 2 bytes.
  Fixed some global QIcon/QPixmap instances that leaked handles on X11.
  Speed up QListView test
  QListView: fix crash when hiding many of the lasts item in a QListView
  Fixed warnings and crash when painting graphics effects outside scene.
  Stabilize QLineEdit test on X11
  (sqlite) Allow shared cache mode
  Make generate uid3 (symbian) work on 64 bit host platform.
  Updated the docs for QPainter::begin/endNativePainting()
  Compile fix for network benchmarks.
  Add a pixmap modification hook to blur pixmap filter cache
  Delete benchmark examples (qtestlib-simple and qtwidgets).
  Restructure tests/benchmarks directory.
  Fixed QImagReader::setAutoDetectImageFormat() to work with plugins.
  ...

1 files changed, 226 insertions, 0 deletions

diff --git a/tests/benchmarks/gui/image/qpixmapcache/tst_qpixmapcache.cpp b/tests/benchmarks/gui/image/qpixmapcache/tst_qpixmapcache.cpp
new file mode 100644
index 0000000..1031ba7
--- /dev/null
+++ b/tests/benchmarks/gui/image/qpixmapcache/tst_qpixmapcache.cpp
@@ -0,0 +1,226 @@
+/****************************************************************************
+**
+** 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 <qtest.h>
+#include <QPixmapCache>
+//TESTED_FILES=
+
+class tst_QPixmapCache : public QObject
+{
+    Q_OBJECT
+
+public:
+    tst_QPixmapCache();
+    virtual ~tst_QPixmapCache();
+
+public slots:
+    void init();
+    void cleanup();
+
+private slots:
+    void insert_data();
+    void insert();
+    void find_data();
+    void find();
+    void styleUseCaseComplexKey();
+    void styleUseCaseComplexKey_data();
+};
+
+tst_QPixmapCache::tst_QPixmapCache()
+{
+}
+
+tst_QPixmapCache::~tst_QPixmapCache()
+{
+}
+
+void tst_QPixmapCache::init()
+{
+}
+
+void tst_QPixmapCache::cleanup()
+{
+}
+
+void tst_QPixmapCache::insert_data()
+{
+    QTest::addColumn<bool>("cacheType");
+    QTest::newRow("QPixmapCache") << true;
+    QTest::newRow("QPixmapCache (int API)") << false;
+}
+
+QList<QPixmapCache::Key> keys;
+
+void tst_QPixmapCache::insert()
+{
+    QFETCH(bool, cacheType);
+    QPixmap p;
+    if (cacheType) {
+        QBENCHMARK {
+            for (int i = 0 ; i <= 10000 ; i++)
+            {
+                QString tmp;
+                tmp.sprintf("my-key-%d", i);
+                QPixmapCache::insert(tmp, p);
+            }
+        }
+    } else {
+        QBENCHMARK {
+            for (int i = 0 ; i <= 10000 ; i++)
+                keys.append(QPixmapCache::insert(p));
+        }
+    }
+}
+
+void tst_QPixmapCache::find_data()
+{
+    QTest::addColumn<bool>("cacheType");
+    QTest::newRow("QPixmapCache") << true;
+    QTest::newRow("QPixmapCache (int API)") << false;
+}
+
+void tst_QPixmapCache::find()
+{
+    QFETCH(bool, cacheType);
+    QPixmap p;
+    if (cacheType) {
+        QBENCHMARK {
+            QString tmp;
+            for (int i = 0 ; i <= 10000 ; i++)
+            {
+                tmp.sprintf("my-key-%d", i);
+                QPixmapCache::find(tmp, p);
+            }
+        }
+    } else {
+        QBENCHMARK {
+            for (int i = 0 ; i <= 10000 ; i++)
+                QPixmapCache::find(keys.at(i), &p);
+        }
+    }
+
+}
+
+void tst_QPixmapCache::styleUseCaseComplexKey_data()
+{
+    QTest::addColumn<bool>("cacheType");
+    QTest::newRow("QPixmapCache") << true;
+    QTest::newRow("QPixmapCache (int API)") << false;
+}
+
+struct styleStruct {
+    QString key;
+    uint state;
+    uint direction;
+    uint complex;
+    uint palette;
+    int width;
+    int height;
+    bool operator==(const styleStruct &str) const
+    {
+        return  str.state == state && str.direction == direction
+                && str.complex == complex && str.palette == palette && str.width == width
+                && str.height == height && str.key == key;
+    }
+};
+
+uint qHash(const styleStruct &myStruct)
+{
+    return qHash(myStruct.state);
+}
+
+void tst_QPixmapCache::styleUseCaseComplexKey()
+{
+    QFETCH(bool, cacheType);
+    QPixmap p;
+    if (cacheType) {
+        QBENCHMARK {
+            for (int i = 0 ; i <= 10000 ; i++)
+            {
+                QString tmp;
+                tmp.sprintf("%s-%d-%d-%d-%d-%d-%d", QString("my-progressbar-%1").arg(i).toLatin1().constData(), 5, 3, 0, 358, 100, 200);
+                QPixmapCache::insert(tmp, p);
+            }
+
+            for (int i = 0 ; i <= 10000 ; i++)
+            {
+                QString tmp;
+                tmp.sprintf("%s-%d-%d-%d-%d-%d-%d", QString("my-progressbar-%1").arg(i).toLatin1().constData(), 5, 3, 0, 358, 100, 200);
+                QPixmapCache::find(tmp, p);
+            }
+        }
+    } else {
+        QHash<styleStruct, QPixmapCache::Key> hash;
+        QBENCHMARK {
+            for (int i = 0 ; i <= 10000 ; i++)
+            {
+                styleStruct myStruct;
+                myStruct.key = QString("my-progressbar-%1").arg(i);
+                myStruct.key = 5;
+                myStruct.key = 4;
+                myStruct.key = 3;
+                myStruct.palette = 358;
+                myStruct.width = 100;
+                myStruct.key = 200;
+                QPixmapCache::Key key = QPixmapCache::insert(p);
+                hash.insert(myStruct, key);
+            }
+            for (int i = 0 ; i <= 10000 ; i++)
+            {
+                styleStruct myStruct;
+                myStruct.key = QString("my-progressbar-%1").arg(i);
+                myStruct.key = 5;
+                myStruct.key = 4;
+                myStruct.key = 3;
+                myStruct.palette = 358;
+                myStruct.width = 100;
+                myStruct.key = 200;
+                QPixmapCache::Key key = hash.value(myStruct);
+                QPixmapCache::find(key, &p);
+            }
+        }
+    }
+
+}
+
+
+QTEST_MAIN(tst_QPixmapCache)
+#include "tst_qpixmapcache.moc"