1 files changed, 16 insertions, 74 deletions

diff --git a/tests/benchmarks/gui/kernel/qguimetatype/tst_qguimetatype.cpp b/tests/benchmarks/gui/kernel/qguimetatype/tst_qguimetatype.cpp
index 8f987470f5..536ef44aa3 100644
--- a/tests/benchmarks/gui/kernel/qguimetatype/tst_qguimetatype.cpp
+++ b/tests/benchmarks/gui/kernel/qguimetatype/tst_qguimetatype.cpp
@@ -1,40 +1,32 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:LGPL21$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
 ** use the contact form at http://qt.digia.com/contact-us.
 **
 ** 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.
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
+** rights. These rights are described in the Digia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -46,77 +38,27 @@ class tst_QGuiMetaType : public QObject
 {
     Q_OBJECT
 
-public:
-    tst_QGuiMetaType();
-    virtual ~tst_QGuiMetaType();
-
 private slots:
-    void constructGuiType_data();
-    void constructGuiType();
-    void constructGuiTypeCopy_data();
-    void constructGuiTypeCopy();
-
     void constructInPlace_data();
     void constructInPlace();
     void constructInPlaceCopy_data();
     void constructInPlaceCopy();
+private:
+    void constructableGuiTypes();
 };
 
-tst_QGuiMetaType::tst_QGuiMetaType()
-{
-}
-
-tst_QGuiMetaType::~tst_QGuiMetaType()
-{
-}
 
-void tst_QGuiMetaType::constructGuiType_data()
+void tst_QGuiMetaType::constructableGuiTypes()
 {
     QTest::addColumn<int>("typeId");
     for (int i = QMetaType::FirstGuiType; i <= QMetaType::LastGuiType; ++i)
         QTest::newRow(QMetaType::typeName(i)) << i;
 }
 
-// Tests how fast QMetaType can default-construct and destroy a Qt GUI
-// type. The purpose of this benchmark is to measure the overhead of
-// using type id-based creation compared to creating the type directly
-// (i.e. "T *t = new T(); delete t;").
-void tst_QGuiMetaType::constructGuiType()
-{
-    QFETCH(int, typeId);
-    QBENCHMARK {
-        for (int i = 0; i < 100000; ++i) {
-            void *data = QMetaType::create(typeId, (void *)0);
-            QMetaType::destroy(typeId, data);
-        }
-    }
-}
-
-void tst_QGuiMetaType::constructGuiTypeCopy_data()
-{
-    constructGuiType_data();
-}
-
-// Tests how fast QMetaType can copy-construct and destroy a Qt GUI
-// type. The purpose of this benchmark is to measure the overhead of
-// using type id-based creation compared to creating the type directly
-// (i.e. "T *t = new T(other); delete t;").
-void tst_QGuiMetaType::constructGuiTypeCopy()
-{
-    QFETCH(int, typeId);
-    QVariant other(typeId, (void *)0);
-    const void *copy = other.constData();
-    QBENCHMARK {
-        for (int i = 0; i < 100000; ++i) {
-            void *data = QMetaType::create(typeId, copy);
-            QMetaType::destroy(typeId, data);
-        }
-    }
-}
 
 void tst_QGuiMetaType::constructInPlace_data()
 {
-    constructGuiType_data();
+    constructableGuiTypes();
 }
 
 void tst_QGuiMetaType::constructInPlace()
@@ -137,7 +79,7 @@ void tst_QGuiMetaType::constructInPlace()
 
 void tst_QGuiMetaType::constructInPlaceCopy_data()
 {
-    constructGuiType_data();
+    constructableGuiTypes();
 }
 
 void tst_QGuiMetaType::constructInPlaceCopy()