aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@qt.io>2017-05-05 14:37:30 +0200
committerErik Verbruggen <erik.verbruggen@qt.io>2017-05-12 08:38:16 +0000
commit98af9f4a5a4caeae6f1eb7b13ae88cacec3b9717 (patch)
tree322b8532585db8ead0965b5258e48141069e336b
parentfdf8daa51abdf04998a855cca71f0128df1a0109 (diff)
Another benchmark fix
Again JS ownership, now shown as an attempt to free a non-malloced pointer. Change-Id: I00a9b1e4918da96aa5bc99a321edc94d76c4f45b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> (cherry picked from commit 63f0406cfbf58e8c3e3369beb8ae6995a7a21650) Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
-rw-r--r--tests/benchmarks/qml/js/qjsengine/qjsengine.pro2
-rw-r--r--tests/benchmarks/qml/js/qjsengine/tst_qjsengine.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/benchmarks/qml/js/qjsengine/qjsengine.pro b/tests/benchmarks/qml/js/qjsengine/qjsengine.pro
index e9be784769..b8c89493e1 100644
--- a/tests/benchmarks/qml/js/qjsengine/qjsengine.pro
+++ b/tests/benchmarks/qml/js/qjsengine/qjsengine.pro
@@ -1,3 +1,4 @@
+CONFIG += benchmark
TEMPLATE = app
TARGET = tst_bench_qjsengine
@@ -5,3 +6,4 @@ SOURCES += tst_qjsengine.cpp
QT += qml testlib
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+macos:CONFIG -= app_bundle
diff --git a/tests/benchmarks/qml/js/qjsengine/tst_qjsengine.cpp b/tests/benchmarks/qml/js/qjsengine/tst_qjsengine.cpp
index 6d34d42a02..08a21c0a60 100644
--- a/tests/benchmarks/qml/js/qjsengine/tst_qjsengine.cpp
+++ b/tests/benchmarks/qml/js/qjsengine/tst_qjsengine.cpp
@@ -329,7 +329,7 @@ void tst_QJSEngine::newQObject()
{
newEngine();
QBENCHMARK {
- (void)m_engine->newQObject(QCoreApplication::instance());
+ (void)m_engine->newQObject(new QObject);
}
}