Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team:
  Add QFontMetrics benchmark.

3 files changed, 118 insertions, 0 deletions

diff --git a/tests/benchmarks/benchmarks.pro b/tests/benchmarks/benchmarks.pro
index 1c78f1f..7a27cc9 100644
--- a/tests/benchmarks/benchmarks.pro
+++ b/tests/benchmarks/benchmarks.pro
@@ -5,6 +5,7 @@ SUBDIRS = containers-associative \
 	qbytearray \
         qfileinfo \
         qfile_vs_qnetworkaccessmanager \
+        qfontmetrics \
         qhostinfo \
 	qpainter \
 	qtestlib-simple	events \
diff --git a/tests/benchmarks/qfontmetrics/main.cpp b/tests/benchmarks/qfontmetrics/main.cpp
new file mode 100644
index 0000000..d3f85ef
--- /dev/null
+++ b/tests/benchmarks/qfontmetrics/main.cpp
@@ -0,0 +1,112 @@
+/****************************************************************************
+**
+** 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 <QObject>
+#include <QFont>
+#include <QFontMetrics>
+
+#include <qtest.h>
+
+//this test benchmarks the once-off (per font configuration) cost
+//associated with using QFontMetrics
+class tst_QFontMetrics : public QObject
+{
+    Q_OBJECT
+public:
+    tst_QFontMetrics() {}
+private slots:
+    void fontmetrics_create();
+    void fontmetrics_create_once_loaded();
+
+    void fontmetrics_height();
+    void fontmetrics_height_once_loaded();
+
+private:
+    void testQFontMetrics(const QFontMetrics &fm);
+};
+
+void tst_QFontMetrics::testQFontMetrics( const QFontMetrics &fm )
+{
+    int fontHeight = fm.height();
+}
+
+void tst_QFontMetrics::fontmetrics_create()
+{
+    QBENCHMARK {
+      QFont boldfont = QApplication::font();
+      boldfont.setBold( true );
+      boldfont.setPointSize(boldfont.pointSize() * 1.5 );
+      QFontMetrics bfm( boldfont );
+    }
+}
+
+void tst_QFontMetrics::fontmetrics_create_once_loaded()
+{
+    QBENCHMARK {
+      QFont boldfont = QApplication::font();
+      boldfont.setBold( true );
+      boldfont.setPointSize(boldfont.pointSize() * 1.5 );
+      QFontMetrics bfm( boldfont );
+    }
+}
+
+void tst_QFontMetrics::fontmetrics_height()
+{
+    QFont boldfont = QApplication::font();
+    boldfont.setBold( true );
+    boldfont.setPointSize(boldfont.pointSize() * 1.5 );
+    QFontMetrics bfm( boldfont );
+
+    QBENCHMARK { testQFontMetrics(bfm); }
+}
+
+void tst_QFontMetrics::fontmetrics_height_once_loaded()
+{
+    QFont boldfont = QApplication::font();
+    boldfont.setBold( true );
+    boldfont.setPointSize(boldfont.pointSize() * 1.5 );
+    QFontMetrics bfm( boldfont );
+    QBENCHMARK { testQFontMetrics(bfm); }
+}
+
+QTEST_MAIN(tst_QFontMetrics)
+
+#include "main.moc"
diff --git a/tests/benchmarks/qfontmetrics/qfontmetrics.pro b/tests/benchmarks/qfontmetrics/qfontmetrics.pro
new file mode 100644
index 0000000..b6c7b92
--- /dev/null
+++ b/tests/benchmarks/qfontmetrics/qfontmetrics.pro
@@ -0,0 +1,5 @@
+load(qttest_p4)
+TEMPLATE = app
+TARGET = tst_QFontMetrics
+
+SOURCES += main.cpp