aboutsummaryrefslogtreecommitdiffstats
path: root/tests/benchmarks
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@theqtcompany.com>2016-03-23 12:49:12 +0100
committerSimon Hausmann <simon.hausmann@theqtcompany.com>2016-03-24 19:39:35 +0000
commitedab97fdf9e5426e442b40aa4dc09b2d9e21870e (patch)
treead760eda8801d79cc811bf45e03ecc0779e42e33 /tests/benchmarks
parentd30aad9e66e10fc511ce51aaca3b28aa221d1da8 (diff)
Removed the QQmlGuard benchmark
It's not really useful for automated benchmarking and by now most of QQml has been ported to QPointer. Change-Id: I4ee34ad481fde9ae9903ad50cba7afd7b6ff7bc5 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
Diffstat (limited to 'tests/benchmarks')
-rw-r--r--tests/benchmarks/qml/pointers/pointers.pro9
-rw-r--r--tests/benchmarks/qml/pointers/tst_pointers.cpp69
-rw-r--r--tests/benchmarks/qml/qml.pro1
3 files changed, 0 insertions, 79 deletions
diff --git a/tests/benchmarks/qml/pointers/pointers.pro b/tests/benchmarks/qml/pointers/pointers.pro
deleted file mode 100644
index ee09010c49..0000000000
--- a/tests/benchmarks/qml/pointers/pointers.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-CONFIG += benchmark
-QT += core-private qml-private testlib
-TEMPLATE = app
-TARGET = tst_pointers
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_pointers.cpp
-
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/benchmarks/qml/pointers/tst_pointers.cpp b/tests/benchmarks/qml/pointers/tst_pointers.cpp
deleted file mode 100644
index 8b981f4532..0000000000
--- a/tests/benchmarks/qml/pointers/tst_pointers.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $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 The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/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 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.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qtest.h>
-#include <QtQml/private/qqmlguard_p.h>
-#include <QWeakPointer>
-
-class tst_pointers : public QObject
-{
- Q_OBJECT
-
-public:
- tst_pointers() {}
-
-private slots:
- void qmlguard();
- void weakPointer();
-};
-
-void tst_pointers::qmlguard()
-{
- QObject *obj = new QObject;
- QBENCHMARK {
- QQmlGuard<QObject> guardedObject;
- guardedObject = obj;
- }
-}
-
-void tst_pointers::weakPointer()
-{
- QObject *obj = new QObject;
- QBENCHMARK {
- QWeakPointer<QObject> guardedObject;
- guardedObject = obj;
- }
-}
-
-QTEST_MAIN(tst_pointers)
-#include "tst_pointers.moc"
diff --git a/tests/benchmarks/qml/qml.pro b/tests/benchmarks/qml/qml.pro
index 53aa68dff3..7969866673 100644
--- a/tests/benchmarks/qml/qml.pro
+++ b/tests/benchmarks/qml/qml.pro
@@ -5,7 +5,6 @@ SUBDIRS += \
compilation \
javascript \
holistic \
- pointers \
qqmlcomponent \
qqmlimage \
qqmlmetaproperty \