diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-06-20 21:20:43 +0200 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-06-20 22:00:39 +0000 |
commit | 3a869515d0dfca76ab378263acb5c6f21e68482b (patch) | |
tree | aabc1a54cf3eb97f9eaf5115b4731c48eb8159c1 | |
parent | ba64b7d013fb95fb7b3afe9f1724edae7fcca2ed (diff) |
macOS: tst_qquickpositioners::test_mirroring: use basic render loop
We seem to be hitting a deadlock some of the time with this test,
probably because it uses two windows.
Task-number: QTBUG-69040
Change-Id: I2e6fd430b22a9e174973661f27c2ac29ec635f60
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
-rw-r--r-- | tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp b/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp index 0395b08f10..fc6b4bd8d6 100644 --- a/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp +++ b/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp @@ -3772,6 +3772,10 @@ void tst_qquickpositioners::test_mirroring() QList<QString> objectNames; objectNames << "one" << "two" << "three" << "four" << "five"; +#ifdef Q_OS_MACOS + qputenv("QSG_RENDER_LOOP","basic"); // QTBUG-69040 +#endif + foreach (const QString qmlFile, qmlFiles) { QScopedPointer<QQuickView> windowA(createView(testFile(qmlFile))); QQuickItem *rootA = qobject_cast<QQuickItem*>(windowA->rootObject()); |