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:
  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.
  QLineEdit: regression: read-only line edits would eat shortcuts.
  QGraphicsItem: Do not crash at exit if there is static QGraphicsItem.
  Make QTextCodec reentrant.
  Fixed bug where GL widget was not fully updated on Vista.

7 files changed, 496 insertions, 0 deletions

diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chip.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chip.cpp
new file mode 100644
index 0000000..4c1020a
--- /dev/null
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chip.cpp
@@ -0,0 +1,182 @@
+/****************************************************************************
+**
+** 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 "chip.h"
+
+#include <QtGui>
+
+Chip::Chip(const QColor &color, int x, int y)
+{
+    this->x = x;
+    this->y = y;
+    this->color = color;
+    setZValue((x + y) % 2);
+
+    setFlags(ItemIsSelectable | ItemIsMovable);
+    setAcceptsHoverEvents(true);
+}
+
+QRectF Chip::boundingRect() const
+{
+    return QRectF(0, 0, 110, 70);
+}
+
+QPainterPath Chip::shape() const
+{
+    QPainterPath path;
+    path.addRect(14, 14, 82, 42);
+    return path;
+}
+
+void Chip::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+    Q_UNUSED(widget);
+
+    QColor fillColor = (option->state & QStyle::State_Selected) ? color.dark(150) : color;
+    if (option->state & QStyle::State_MouseOver)
+        fillColor = fillColor.light(125);
+
+    if (option->levelOfDetail < 0.2) {
+        if (option->levelOfDetail < 0.125) {
+            painter->fillRect(QRectF(0, 0, 110, 70), fillColor);
+            return;
+        }
+
+        QBrush b = painter->brush();
+        painter->setBrush(fillColor);
+        painter->drawRect(13, 13, 97, 57);
+        painter->setBrush(b);
+        return;
+    }
+
+    QPen oldPen = painter->pen();
+    QPen pen = oldPen;
+    int width = 0;
+    if (option->state & QStyle::State_Selected)
+        width += 2;
+
+    pen.setWidth(width);
+    QBrush b = painter->brush();
+    painter->setBrush(QBrush(fillColor.dark(option->state & QStyle::State_Sunken ? 120 : 100)));
+
+    painter->drawRect(QRect(14, 14, 79, 39));
+    painter->setBrush(b);
+
+    if (option->levelOfDetail >= 1) {
+        painter->setPen(QPen(Qt::gray, 1));
+        painter->drawLine(15, 54, 94, 54);
+        painter->drawLine(94, 53, 94, 15);
+        painter->setPen(QPen(Qt::black, 0));
+    }
+
+    // Draw text
+    if (option->levelOfDetail >= 2) {
+        QFont font("Times", 10);
+        font.setStyleStrategy(QFont::ForceOutline);
+        painter->setFont(font);
+        painter->save();
+        painter->scale(0.1, 0.1);
+        painter->drawText(170, 180, QString("Model: VSC-2000 (Very Small Chip) at %1x%2").arg(x).arg(y));
+        painter->drawText(170, 200, QString("Serial number: DLWR-WEER-123L-ZZ33-SDSJ"));
+        painter->drawText(170, 220, QString("Manufacturer: Chip Manufacturer"));
+        painter->restore();
+    }
+
+    // Draw lines
+    QVarLengthArray<QLineF, 36> lines;
+    if (option->levelOfDetail >= 0.5) {
+        for (int i = 0; i <= 10; i += (option->levelOfDetail > 0.5 ? 1 : 2)) {
+            lines.append(QLineF(18 + 7 * i, 13, 18 + 7 * i, 5));
+            lines.append(QLineF(18 + 7 * i, 54, 18 + 7 * i, 62));
+        }
+        for (int i = 0; i <= 6; i += (option->levelOfDetail > 0.5 ? 1 : 2)) {
+            lines.append(QLineF(5, 18 + i * 5, 13, 18 + i * 5));
+            lines.append(QLineF(94, 18 + i * 5, 102, 18 + i * 5));
+        }
+    }
+    if (option->levelOfDetail >= 0.4) {
+        const QLineF lineData[] = {
+            QLineF(25, 35, 35, 35),
+            QLineF(35, 30, 35, 40),
+            QLineF(35, 30, 45, 35),
+            QLineF(35, 40, 45, 35),
+            QLineF(45, 30, 45, 40),
+            QLineF(45, 35, 55, 35)
+        };
+        lines.append(lineData, 6);
+    }
+    painter->drawLines(lines.data(), lines.size());
+
+    // Draw red ink
+    if (stuff.size() > 1) {
+        QPen p = painter->pen();
+        painter->setPen(QPen(Qt::red, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
+        painter->setBrush(Qt::NoBrush);
+        QPainterPath path;
+        path.moveTo(stuff.first());
+        for (int i = 1; i < stuff.size(); ++i)
+            path.lineTo(stuff.at(i));
+        painter->drawPath(path);
+        painter->setPen(p);
+    }
+}
+
+void Chip::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+    QGraphicsItem::mousePressEvent(event);
+    update();
+}
+
+void Chip::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+{
+    if (event->modifiers() & Qt::ShiftModifier) {
+        stuff << event->pos();
+        update();
+        return;
+    }
+    QGraphicsItem::mouseMoveEvent(event);
+}
+
+void Chip::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
+    QGraphicsItem::mouseReleaseEvent(event);
+    update();
+}
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chip.h b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chip.h
new file mode 100644
index 0000000..9db23f9
--- /dev/null
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chip.h
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** 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$
+**
+****************************************************************************/
+
+#ifndef CHIP_H
+#define CHIP_H
+
+#include <QtGui/QColor>
+#include <QtGui/QGraphicsItem>
+
+class Chip : public QGraphicsItem
+{
+public:
+    Chip(const QColor &color, int x, int y);
+
+    QRectF boundingRect() const;
+    QPainterPath shape() const;
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *item, QWidget *widget);
+
+protected:
+    void mousePressEvent(QGraphicsSceneMouseEvent *event);
+    void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+
+private:
+    int x, y;
+    QColor color;
+    QList<QPointF> stuff;
+};
+
+#endif
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.cpp
new file mode 100644
index 0000000..8cada67
--- /dev/null
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.cpp
@@ -0,0 +1,144 @@
+/****************************************************************************
+**
+** 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 "chiptester.h"
+#include "chip.h"
+
+#include <QtGui>
+#ifndef QT_NO_OPENGL
+#include <QtOpenGL>
+#endif
+
+ChipTester::ChipTester(QWidget *parent)
+    : QGraphicsView(parent),
+      npaints(0)
+{
+    resize(400, 300);
+    setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    setFrameStyle(0);
+    setTransformationAnchor(NoAnchor);
+
+    populateScene();
+    setScene(scene);
+
+    setWindowTitle(tr("Chip Demo"));
+}
+
+void ChipTester::setAntialias(bool enabled)
+{
+    setRenderHint(QPainter::Antialiasing, enabled);
+}
+
+void ChipTester::setOpenGL(bool enabled)
+{
+#ifndef QT_NO_OPENGL
+    setViewport(enabled ? new QGLWidget(QGLFormat(QGL::SampleBuffers)) : 0);
+#endif
+}
+
+void ChipTester::setOperation(Operation operation)
+{
+    this->operation = operation;
+}
+
+void ChipTester::runBenchmark()
+{
+    npaints = 0;
+    timerId = startTimer(0);
+    stopWatch.start();
+    eventLoop.exec();
+    killTimer(timerId);
+}
+
+void ChipTester::paintEvent(QPaintEvent *event)
+{
+    QGraphicsView::paintEvent(event);
+    if (++npaints == 50)
+	eventLoop.quit();
+}
+
+void ChipTester::timerEvent(QTimerEvent *)
+{
+    switch (operation) {
+    case Rotate360:
+	rotate(1);
+	break;
+    case ZoomInOut: {
+	qreal s = 0.05 + (npaints / 20.0);
+	setTransform(QTransform().scale(s, s));
+	break;
+    }
+    case Translate: {
+	int offset = horizontalScrollBar()->minimum()
+	    + (npaints % (horizontalScrollBar()->maximum() - horizontalScrollBar()->minimum()));
+	horizontalScrollBar()->setValue(offset);
+	break;
+    }
+    }
+}
+
+void ChipTester::populateScene()
+{
+    scene = new QGraphicsScene;
+
+    QImage image(":/qt4logo.png");
+
+    // Populate scene
+    int xx = 0;
+    int nitems = 0;
+    for (int i = -1100; i < 1100; i += 110) {
+        ++xx;
+        int yy = 0;
+        for (int j = -700; j < 700; j += 70) {
+            ++yy;
+            qreal x = (i + 1100) / 2200.0;
+            qreal y = (j + 700) / 1400.0;
+
+            QColor color(image.pixel(int(image.width() * x), int(image.height() * y)));
+            QGraphicsItem *item = new Chip(color, xx, yy);
+            item->setPos(QPointF(i, j));
+            scene->addItem(item);
+
+            ++nitems;
+        }
+    }
+}
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.h b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.h
new file mode 100644
index 0000000..1a73bb7
--- /dev/null
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.h
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** 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$
+**
+****************************************************************************/
+
+#ifndef CHIPTESTER_H
+#define CHIPTESTER_H
+
+#include <QtGui>
+
+QT_FORWARD_DECLARE_CLASS(QGraphicsScene)
+QT_FORWARD_DECLARE_CLASS(QGraphicsView)
+QT_FORWARD_DECLARE_CLASS(QLabel)
+QT_FORWARD_DECLARE_CLASS(QSlider)
+QT_FORWARD_DECLARE_CLASS(QSplitter)
+
+class ChipTester : public QGraphicsView
+{
+    Q_OBJECT
+public:
+    enum Operation {
+	Rotate360,
+	ZoomInOut,
+	Translate
+    };
+    ChipTester(QWidget *parent = 0);
+    
+    void setAntialias(bool enabled);
+    void setOpenGL(bool enabled);
+    void runBenchmark();
+    void setOperation(Operation operation);
+
+protected:
+    void paintEvent(QPaintEvent *event);
+    void timerEvent(QTimerEvent *event);
+
+private:
+    void populateScene();
+
+    QGraphicsView *view;    
+    QGraphicsScene *scene;
+    int npaints;
+    int timerId;
+    QEventLoop eventLoop;
+    QTime stopWatch;
+    Operation operation;
+};
+
+#endif
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.pri b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.pri
new file mode 100644
index 0000000..a9e0bf8
--- /dev/null
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.pri
@@ -0,0 +1,12 @@
+SOURCES += \
+	chiptester/chiptester.cpp \
+	chiptester/chip.cpp
+
+HEADERS += \
+	chiptester/chiptester.h \
+	chiptester/chip.h
+
+RESOURCES += \
+        chiptester/images.qrc
+
+contains(QT_CONFIG, opengl) QT += opengl
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/images.qrc b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/images.qrc
new file mode 100644
index 0000000..73e8620
--- /dev/null
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/images.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>qt4logo.png</file>
+</qresource>
+</RCC>
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/qt4logo.png b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/qt4logo.png
new file mode 100644
index 0000000..157e86e
--- /dev/null
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/qt4logo.png