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.
  ...

3 files changed, 376 insertions, 0 deletions

diff --git a/tests/benchmarks/gui/itemviews/itemviews.pro b/tests/benchmarks/gui/itemviews/itemviews.pro
new file mode 100644
index 0000000..be0ee55
--- /dev/null
+++ b/tests/benchmarks/gui/itemviews/itemviews.pro
@@ -0,0 +1,3 @@
+TEMPLATE = subdirs
+SUBDIRS = \
+        qtableview
diff --git a/tests/benchmarks/gui/itemviews/qtableview/qtableview.pro b/tests/benchmarks/gui/itemviews/qtableview/qtableview.pro
new file mode 100644
index 0000000..02bc530
--- /dev/null
+++ b/tests/benchmarks/gui/itemviews/qtableview/qtableview.pro
@@ -0,0 +1,6 @@
+load(qttest_p4)
+TEMPLATE = app
+TARGET = tst_qtableview
+
+SOURCES += tst_qtableview.cpp
+
diff --git a/tests/benchmarks/gui/itemviews/qtableview/tst_qtableview.cpp b/tests/benchmarks/gui/itemviews/qtableview/tst_qtableview.cpp
new file mode 100644
index 0000000..a84d8b5
--- /dev/null
+++ b/tests/benchmarks/gui/itemviews/qtableview/tst_qtableview.cpp
@@ -0,0 +1,367 @@
+/****************************************************************************
+**
+** 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 <QDebug>
+#include <QTableView>
+#include <QImage>
+#include <QPainter>
+
+//TESTED_FILES=
+
+class QtTestTableModel: public QAbstractTableModel
+{
+    Q_OBJECT
+
+
+public:
+    QtTestTableModel(int rows = 0, int columns = 0, QObject *parent = 0)
+        : QAbstractTableModel(parent),
+          row_count(rows),
+          column_count(columns) {}
+
+    int rowCount(const QModelIndex& = QModelIndex()) const { return row_count; }
+    int columnCount(const QModelIndex& = QModelIndex()) const { return column_count; }
+    bool isEditable(const QModelIndex &) const { return true; }
+
+    QVariant data(const QModelIndex &idx, int role) const
+    {
+        if (!idx.isValid() || idx.row() >= row_count || idx.column() >= column_count) {
+            qWarning() << "Invalid modelIndex [%d,%d,%p]" << idx;
+            return QVariant();
+        }
+
+        if (role == Qt::DisplayRole || role == Qt::EditRole)
+            return QString("[%1,%2,%3]").arg(idx.row()).arg(idx.column()).arg(0);
+
+        return QVariant();
+    }
+
+    bool insertRows(int start, int count, const QModelIndex &parent = QModelIndex())
+    {
+        if (start < 0 || start > row_count)
+            return false;
+
+        beginInsertRows(parent, start, start + count - 1);
+        row_count += count;
+        endInsertRows();
+        return true;
+    }
+
+    bool removeRows(int start, int count, const QModelIndex &parent = QModelIndex())
+    {
+        if (start < 0 || start >= row_count || row_count < count)
+            return false;
+
+        beginRemoveRows(parent, start, start + count - 1);
+        row_count -= count;
+        endRemoveRows();
+        return true;
+    }
+
+    bool insertColumns(int start, int count, const QModelIndex &parent = QModelIndex())
+    {
+        if (start < 0 || start > column_count)
+            return false;
+
+        beginInsertColumns(parent, start, start + count - 1);
+        column_count += count;
+        endInsertColumns();
+        return true;
+    }
+
+    bool removeColumns(int start, int count, const QModelIndex &parent = QModelIndex())
+    {
+        if (start < 0 || start >= column_count || column_count < count)
+            return false;
+
+        beginRemoveColumns(parent, start, start + count - 1);
+        column_count -= count;
+        endRemoveColumns();
+        return true;
+    }
+
+    int row_count;
+    int column_count;
+};
+
+
+
+
+class tst_QTableView : public QObject
+{
+    Q_OBJECT
+
+public:
+    tst_QTableView();
+    virtual ~tst_QTableView();
+
+public slots:
+    void init();
+    void cleanup();
+
+private slots:
+    void spanInit();
+    void spanDraw();
+    void spanSelectColumn();
+    void spanSelectAll();
+    void rowInsertion_data();
+    void rowInsertion();
+    void rowRemoval_data();
+    void rowRemoval();
+    void columnInsertion_data();
+    void columnInsertion();
+    void columnRemoval_data();
+    void columnRemoval();
+private:
+    static inline void spanInit_helper(QTableView *);
+};
+
+tst_QTableView::tst_QTableView()
+{
+}
+
+tst_QTableView::~tst_QTableView()
+{
+}
+
+void tst_QTableView::init()
+{
+}
+
+void tst_QTableView::cleanup()
+{
+}
+
+void tst_QTableView::spanInit_helper(QTableView *view)
+{
+    for (int i=0; i < 40; i++) {
+        view->setSpan(1+i%2, 1+4*i, 1+i%3, 2);
+    }
+    
+    for (int i=1; i < 40; i++) {
+        view->setSpan(6 + i*7, 4, 4, 50);
+    }
+}
+
+void tst_QTableView::spanInit()
+{
+    QtTestTableModel model(500, 500);
+    QTableView v;
+    v.setModel(&model);
+    
+    QBENCHMARK {
+        spanInit_helper(&v);
+    }
+}
+
+void tst_QTableView::spanDraw()
+{
+    QtTestTableModel model(500, 500);
+    QTableView v;
+    v.setModel(&model);
+    
+    spanInit_helper(&v);
+    v.show();
+    v.resize(500,500);
+    QTest::qWait(30);
+
+    QImage image(500, 500, QImage::Format_ARGB32_Premultiplied);
+    QPainter painter(&image);
+    QBENCHMARK {
+        v.render(&painter);
+    }
+}
+
+void tst_QTableView::spanSelectAll()
+{
+    QtTestTableModel model(500, 500);
+    QTableView v;
+    v.setModel(&model);
+    
+    spanInit_helper(&v);
+    v.show();
+    QTest::qWait(30);
+    
+    QBENCHMARK {
+        v.selectAll();
+    }
+}
+
+void tst_QTableView::spanSelectColumn()
+{
+    QtTestTableModel model(500, 500);
+    QTableView v;
+    v.setModel(&model);
+    
+    spanInit_helper(&v);
+    v.show();
+    QTest::qWait(30);
+    
+    QBENCHMARK {
+        v.selectColumn(22);
+    }
+}
+
+typedef QVector<QRect> SpanList;
+Q_DECLARE_METATYPE(SpanList)
+
+void spansData()
+{
+    QTest::addColumn<SpanList>("spans");
+
+    QTest::newRow("Without spans")
+        << SpanList();
+
+    QTest::newRow("With spans")
+            << (SpanList()
+                  << QRect(0, 1, 1, 2)
+                  << QRect(1, 2, 1, 2)
+                  << QRect(2, 2, 1, 5)
+                  << QRect(2, 8, 1, 2)
+                  << QRect(3, 4, 1, 2)
+                  << QRect(4, 4, 1, 4)
+                  << QRect(5, 6, 1, 3)
+                  << QRect(6, 7, 1, 3));
+}
+
+void tst_QTableView::rowInsertion_data()
+{
+    spansData();
+}
+
+void tst_QTableView::rowInsertion()
+{
+    QFETCH(SpanList, spans);
+
+    QtTestTableModel model(10, 10);
+    QTableView view;
+    view.setModel(&model);
+
+    foreach (QRect span, spans)
+        view.setSpan(span.top(), span.left(), span.height(), span.width());
+    view.show();
+    QTest::qWait(50);
+
+    QBENCHMARK_ONCE {
+        view.model()->insertRows(0, 2);
+        view.model()->insertRows(5, 2);
+        view.model()->insertRows(8, 2);
+        view.model()->insertRows(12, 2);
+    }
+}
+
+void tst_QTableView::rowRemoval_data()
+{
+    spansData();
+}
+
+void tst_QTableView::rowRemoval()
+{
+    QFETCH(SpanList, spans);
+
+    QtTestTableModel model(10, 10);
+    QTableView view;
+    view.setModel(&model);
+
+    foreach (QRect span, spans)
+        view.setSpan(span.top(), span.left(), span.height(), span.width());
+    view.show();
+    QTest::qWait(50);
+
+    QBENCHMARK_ONCE {
+        view.model()->removeRows(3, 3);
+    }
+}
+
+void tst_QTableView::columnInsertion_data()
+{
+    spansData();
+}
+
+void tst_QTableView::columnInsertion()
+{
+    QFETCH(SpanList, spans);
+
+    QtTestTableModel model(10, 10);
+    QTableView view;
+    view.setModel(&model);
+
+    // Same set as for rowInsertion, just swapping columns and rows.
+    foreach (QRect span, spans)
+        view.setSpan(span.left(), span.top(), span.width(), span.height());
+    view.show();
+    QTest::qWait(50);
+
+    QBENCHMARK_ONCE {
+        view.model()->insertColumns(0, 2);
+        view.model()->insertColumns(5, 2);
+        view.model()->insertColumns(8, 2);
+        view.model()->insertColumns(12, 2);
+    }
+}
+
+void tst_QTableView::columnRemoval_data()
+{
+    spansData();
+}
+
+void tst_QTableView::columnRemoval()
+{
+    QFETCH(SpanList, spans);
+
+    QtTestTableModel model(10, 10);
+    QTableView view;
+    view.setModel(&model);
+
+    // Same set as for rowRemoval, just swapping columns and rows.
+    foreach (QRect span, spans)
+        view.setSpan(span.left(), span.top(), span.width(), span.height());
+    view.show();
+    QTest::qWait(50);
+
+    QBENCHMARK_ONCE {
+        view.model()->removeColumns(3, 3);
+    }
+}
+
+QTEST_MAIN(tst_QTableView)
+#include "tst_qtableview.moc"