diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2018-07-16 13:53:29 +0000 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-07-16 13:54:31 +0000 |
| commit | b98a8277d82f0a749aadaeff0c5f042cd359868f (patch) | |
| tree | f5735bd7d40ae5c1f3b4a18c429f81192a1a5b1f | |
| parent | e613de803c85191d3fbbef5a8b0f5e8b5ed8c76f (diff) | |
Revert "tst_qquickpositioners: Remove forced basic renderloop workaround"
This reverts commit a7f17c437e1c5b33ee6ac39e05f33ab3648a2fdc.
Back this change out temporarily until the qtbase fix is in qt5.git.
Change-Id: I0c0b764b67180efe772e6aa9db082b708ff2fc84
Reviewed-by: Simon Hausmann <simon.hausmann@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 9881af690c..ec31acf035 100644 --- a/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp +++ b/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp @@ -3774,6 +3774,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()); |