diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2018-02-07 17:25:24 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2018-02-08 08:42:13 +0000 |
| commit | 02c5209db58ae000bdd5066e9bc4cc6c875646f7 (patch) | |
| tree | 2e666cb22d12f4b8c2d0e94becf84a2aed5f9e9f /tests/auto/qml/debugger | |
| parent | cefd0913c302c0821a0d40e95f5f85113e9f17db (diff) | |
QmlDebug: Use EngineControl to hold engines until we're done with them
Holding the engines with EngineControl makes sure we always receive the
full trace before the connection drops.
Task-number: QTBUG-66269
Change-Id: I9177c2a52743ba781547696508342c8d98557121
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/qml/debugger')
| -rw-r--r-- | tests/auto/qml/debugger/qqmlprofilerservice/BLACKLIST | 10 | ||||
| -rw-r--r-- | tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp | 7 |
2 files changed, 4 insertions, 13 deletions
diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/BLACKLIST b/tests/auto/qml/debugger/qqmlprofilerservice/BLACKLIST deleted file mode 100644 index 30e254e164..0000000000 --- a/tests/auto/qml/debugger/qqmlprofilerservice/BLACKLIST +++ /dev/null @@ -1,10 +0,0 @@ -# QTBUG-66230 -[profileOnExit] -osx -windows -[translationBinding] -osx -windows -[memory] -osx -windows diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp index c32fa7ea7d..90c61afe13 100644 --- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp +++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp @@ -244,9 +244,10 @@ QQmlDebugTest::ConnectResult tst_QQmlProfilerService::connect( m_isComplete = false; // ### Still using qmlscene due to QTBUG-33377 - return QQmlDebugTest::connect(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene", - restrictServices ? QStringLiteral("CanvasFrameRate") : QString(), - testFile(file), block); + return QQmlDebugTest::connect( + QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmlscene", + restrictServices ? QQmlDebuggingEnabler::profilerServices().join(',') : QString(), + testFile(file), block); } void tst_QQmlProfilerService::checkProcessTerminated() |