summaryrefslogtreecommitdiffstats
path: root/src/tools/testrunner/testrunner.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools/testrunner/testrunner.cpp')
-rw-r--r--src/tools/testrunner/testrunner.cpp12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/tools/testrunner/testrunner.cpp b/src/tools/testrunner/testrunner.cpp
index ce10cefd..7402adad 100644
--- a/src/tools/testrunner/testrunner.cpp
+++ b/src/tools/testrunner/testrunner.cpp
@@ -135,7 +135,6 @@ QTestRootObject::QTestRootObject(QObject *parent)
: QObject(parent)
, m_windowShown(false)
, m_hasTestCase(false)
- , m_hasQuit(false)
, m_defined(new QQmlPropertyMap(this))
{
#if defined(QT_OPENGL_ES_2_ANGLE)
@@ -153,9 +152,6 @@ QTestRootObject *QTestRootObject::instance()
return object;
}
-
-
-
static QObject *testRootObject(QQmlEngine *engine, QJSEngine *jsEngine)
{
Q_UNUSED(engine);
@@ -205,20 +201,16 @@ void TestRunner::initialize(const QString &testFile, const QStringList &testRunn
QTestRootObject::instance()->init();
}
-int TestRunner::exec(QQmlEngine *engine)
+int TestRunner::exec()
{
QEventLoop eventLoop;
- QObject::connect(engine, &QQmlEngine::quit,
- QTestRootObject::instance(), &QTestRootObject::quit);
- QObject::connect(engine, &QQmlEngine::quit,
- &eventLoop, &QEventLoop::quit);
QTestRootObject::instance()->setWindowShown(true);
if (QTest::printAvailableFunctions)
return 0;
- if (!QTestRootObject::instance()->hasQuit() && QTestRootObject::instance()->hasTestCase())
+ if (QTestRootObject::instance()->hasTestCase())
eventLoop.exec();
QuickTestResult::setProgramName(nullptr);