Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6

7 files changed, 182 insertions, 15 deletions

diff --git a/tests/benchmarks/benchmarks.pro b/tests/benchmarks/benchmarks.pro
index 9170039..bb20dcf 100644
--- a/tests/benchmarks/benchmarks.pro
+++ b/tests/benchmarks/benchmarks.pro
@@ -20,6 +20,25 @@ SUBDIRS = containers-associative \
         qregion \
         qvariant \
 	qwidget	\
-	qtwidgets
+	qtwidgets \
+	qapplication \
+	qdir \
+	qdiriterator \
+	qgraphicsanchorlayout \
+	qgraphicsitem \
+	qgraphicswidget \
+	qmetaobject \
+	qpixmapcache \
+	qquaternion \
+	qscriptclass \
+	qscriptengine \
+	qscriptvalue \
+	qstringbuilder \
+	qstylesheetstyle \
+	qsvgrenderer \
+	qtableview \
+	qthreadstorage
+
+
 
 contains(QT_CONFIG, opengl): SUBDIRS += opengl
diff --git a/tests/benchmarks/events/main.cpp b/tests/benchmarks/events/main.cpp
index 7c9de8f..09d6c53 100644
--- a/tests/benchmarks/events/main.cpp
+++ b/tests/benchmarks/events/main.cpp
@@ -47,6 +47,7 @@ class PingPong : public QObject
 {
 public:
     void setPeer(QObject *peer);
+    void resetCounter() {m_counter = 100;}
 
 protected:
     bool event(QEvent *e);
@@ -69,7 +70,7 @@ bool PingPong::event(QEvent *)
         QEvent *e = new QEvent(QEvent::User);
         QCoreApplication::postEvent(m_peer, e);
     } else {
-        QCoreApplication::quit();
+        QTestEventLoop::instance().exitLoop();
     }
     return true;
 }
@@ -149,6 +150,10 @@ void EventsBench::sendEvent()
 void EventsBench::postEvent_data()
 {
     QTest::addColumn<bool>("filterEvents");
+    // The first time an eventloop is executed, the case runs radically slower at least
+    // on some platforms, so test the "no eventfilter" case to get a comparable results
+    // with the "eventfilter" case.
+    QTest::newRow("first time, no eventfilter") << false;
     QTest::newRow("no eventfilter") << false;
     QTest::newRow("eventfilter") << true;
 }
@@ -164,8 +169,14 @@ void EventsBench::postEvent()
         ping.installEventFilter(this);
         pong.installEventFilter(this);
     }
-    QEvent *e = new QEvent(QEvent::User);
+
     QBENCHMARK {
+        // In case multiple iterations are done, event needs to be created inside the QBENCHMARK,
+        // or it gets deleted once first iteration exits and can cause a crash. Similarly,
+        // ping and pong need their counters reset.
+        QEvent *e = new QEvent(QEvent::User);
+        ping.resetCounter();
+        pong.resetCounter();
         QCoreApplication::postEvent(&ping, e);
         QTestEventLoop::instance().enterLoop( 61 );
     }
diff --git a/tests/benchmarks/qdiriterator/main.cpp b/tests/benchmarks/qdiriterator/main.cpp
index 2a400e3..9e4e53e 100644
--- a/tests/benchmarks/qdiriterator/main.cpp
+++ b/tests/benchmarks/qdiriterator/main.cpp
@@ -73,7 +73,7 @@ private slots:
 
 void tst_qdiriterator::data()
 {
-#ifdef Q_OS_WINCE
+#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
     QByteArray qtdir = qPrintable(QCoreApplication::applicationDirPath());
     qtdir += "/depot";
 #else
@@ -148,9 +148,9 @@ static int posix_helper(const char *dirpath)
 
     int count = 0;
     while ((entry = ::readdir(dir))) {
-        if (qstrcmp(entry->d_name, ".") == 0)  
+        if (qstrcmp(entry->d_name, ".") == 0)
             continue;
-        if (qstrcmp(entry->d_name, "..") == 0)  
+        if (qstrcmp(entry->d_name, "..") == 0)
             continue;
         ++count;
         QByteArray ba = dirpath;
@@ -198,7 +198,7 @@ void tst_qdiriterator::diriterator()
             //QDir::AllEntries | QDir::Hidden,
             QDir::Files,
             QDirIterator::Subdirectories);
-        
+
         while (dir.hasNext()) {
             dir.next();
             //printf("%s\n", qPrintable(dir.fileName()));
@@ -231,7 +231,7 @@ void tst_qdiriterator::fsiterator()
             //QDir::Files | QDir::NoDotAndDotDot,
             QDir::Files,
             QFileSystemIterator::Subdirectories);
-        
+
         for (; !dir.atEnd(); dir.next()) {
             dump && printf("%d %s\n",
                 dir.fileInfo().isDir(),
diff --git a/tests/benchmarks/qdiriterator/qdiriterator.pro b/tests/benchmarks/qdiriterator/qdiriterator.pro
index fb4b753..e06d746 100755
--- a/tests/benchmarks/qdiriterator/qdiriterator.pro
+++ b/tests/benchmarks/qdiriterator/qdiriterator.pro
@@ -15,7 +15,7 @@ SOURCES += main.cpp
 SOURCES += qfilesystemiterator.cpp
 HEADERS += qfilesystemiterator.h
 
-wince*: {
+wince*|symbian: {
    corelibdir.sources = $$QT_SOURCE_TREE/src/corelib
    corelibdir.path = ./depot/src
    DEPLOYMENT += corelibdir
diff --git a/tests/benchmarks/qstylesheetstyle/main.cpp b/tests/benchmarks/qstylesheetstyle/main.cpp
index 19efcab..d6fa48c 100644
--- a/tests/benchmarks/qstylesheetstyle/main.cpp
+++ b/tests/benchmarks/qstylesheetstyle/main.cpp
@@ -49,16 +49,16 @@ class tst_qstylesheetstyle : public QObject
 private slots:
     void empty();
     void empty_events();
-    
+
     void simple();
     void simple_events();
-    
+
     void grid_data();
     void grid();
-    
+
 private:
     QWidget *buildSimpleWidgets();
-    
+
 };
 
 
@@ -103,7 +103,7 @@ void tst_qstylesheetstyle::empty_events()
     delete w;
 }
 
-static const char *simple_css = 
+static const char *simple_css =
    " QLineEdit { background: red; }   QPushButton { border: 1px solid yellow; color: pink; }  \n"
    " QCheckBox { margin: 3px 5px; background-color:red; } QAbstractButton { background-color: #456; } \n"
    " QFrame { padding: 3px; } QLabel { color: black } QSpinBox:hover { background-color:blue; }  ";
@@ -138,7 +138,7 @@ void tst_qstylesheetstyle::grid_data()
         QTest::addColumn<bool>("events");
         QTest::addColumn<bool>("show");
         QTest::addColumn<int>("N");
-        for (int n = 5; n <= 25; n += 5) { 
+        for (int n = 5; n <= 25; n += 5) {
            const QByteArray nString = QByteArray::number(n*n);
             QTest::newRow(("simple--" + nString).constData()) << false << false << n;
             QTest::newRow(("events--" + nString).constData()) << true << false << n;
@@ -153,6 +153,13 @@ void tst_qstylesheetstyle::grid()
     QFETCH(bool, show);
     QFETCH(int, N);
 
+#ifdef Q_OS_SYMBIAN
+    // Symbian has limited stack (max 80k), which will run out when N >= 20 due to
+    // QWidget::show() using recursion among grid labels somewhere down the line.
+    if (show && N >= 20)
+        QSKIP("Grid too big for device to show", SkipSingle);
+#endif
+
     QWidget *w = new QWidget();
     QGridLayout *layout = new QGridLayout(w);
     w->setLayout(layout);
diff --git a/tests/benchmarks/qthreadstorage/qthreadstorage.pro b/tests/benchmarks/qthreadstorage/qthreadstorage.pro
new file mode 100644
index 0000000..f9c1978
--- /dev/null
+++ b/tests/benchmarks/qthreadstorage/qthreadstorage.pro
@@ -0,0 +1,6 @@
+load(qttest_p4)
+TEMPLATE = app
+TARGET = tst_qthreadstorage
+
+SOURCES += tst_qthreadstorage.cpp
+
diff --git a/tests/benchmarks/qthreadstorage/tst_qthreadstorage.cpp b/tests/benchmarks/qthreadstorage/tst_qthreadstorage.cpp
new file mode 100644
index 0000000..c00bf5a
--- /dev/null
+++ b/tests/benchmarks/qthreadstorage/tst_qthreadstorage.cpp
@@ -0,0 +1,124 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 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 <QtCore>
+
+//TESTED_FILES=
+
+QThreadStorage<int *> dummy[8];
+
+QThreadStorage<QString *> tls1;
+
+class tst_QThreadStorage : public QObject
+{
+    Q_OBJECT
+
+public:
+    tst_QThreadStorage();
+    virtual ~tst_QThreadStorage();
+
+public slots:
+    void init();
+    void cleanup();
+
+private slots:
+    void construct();
+    void get();
+    void set();
+};
+
+tst_QThreadStorage::tst_QThreadStorage()
+{
+}
+
+tst_QThreadStorage::~tst_QThreadStorage()
+{
+}
+
+void tst_QThreadStorage::init()
+{
+    dummy[1].setLocalData(new int(5));
+    dummy[2].setLocalData(new int(4));
+    dummy[3].setLocalData(new int(3));
+    tls1.setLocalData(new QString());
+}
+
+void tst_QThreadStorage::cleanup()
+{
+}
+
+void tst_QThreadStorage::construct()
+{
+    QBENCHMARK {
+        QThreadStorage<int *> ts;
+    }
+}
+
+
+void tst_QThreadStorage::get()
+{
+    QThreadStorage<int *> ts;
+    ts.setLocalData(new int(45));
+
+    int count = 0;
+    QBENCHMARK {
+        int *i = ts.localData();
+        count += *i;
+    }
+    ts.setLocalData(0);
+}
+
+void tst_QThreadStorage::set()
+{
+    QThreadStorage<int *> ts;
+
+    int count = 0;
+    QBENCHMARK {
+        ts.setLocalData(new int(count));
+        count++;
+    }
+    ts.setLocalData(0);
+}
+
+
+QTEST_MAIN(tst_QThreadStorage)
+#include "tst_qthreadstorage.moc"