diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2019-10-11 15:01:26 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2019-10-14 15:23:43 +0200 |
| commit | 62105a2f4c688d4646330113af9f4553b3d85927 (patch) | |
| tree | 8f6ab3e7d13103bb3efeb8934e7ae18a6cd8f8eb | |
| parent | e6ccc83aced775621c54f2b563462b57d3fe2e01 (diff) | |
tst_qquickpopup: ignore ShaderEffectSource warning in debug builds
It was commented out but should have been #ifdef'd, and the explanation
is wrong.
This amends 83fbf44.
Change-Id: Ibe752d63a42805361b13edc6beafcf1f3738f02f
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
(cherry picked from commit 9685d8f97e8bb448c90dd87b4e86c0ea8438436a)
| -rw-r--r-- | tests/auto/qquickpopup/tst_qquickpopup.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tests/auto/qquickpopup/tst_qquickpopup.cpp b/tests/auto/qquickpopup/tst_qquickpopup.cpp index f73a25d9..24bfb771 100644 --- a/tests/auto/qquickpopup/tst_qquickpopup.cpp +++ b/tests/auto/qquickpopup/tst_qquickpopup.cpp @@ -1180,9 +1180,11 @@ void tst_QQuickPopup::toolTipCrashOnClose() QQuickWindow *window = helper.window; window->show(); - // TODO: Using ignoreMessage() fails in CI with macOS for release builds, - // so for now we let the warning through. -// QTest::ignoreMessage(QtWarningMsg, "ShaderEffectSource: 'recursive' must be set to true when rendering recursively."); + // The warning only occurs with debug builds for some reason. + // In any case, the warning is irrelevant, but using ShaderEffectSource is important, so we ignore it. +#ifdef QT_DEBUG + QTest::ignoreMessage(QtWarningMsg, "ShaderEffectSource: 'recursive' must be set to true when rendering recursively."); +#endif QVERIFY(QTest::qWaitForWindowActive(window)); QTest::mouseMove(window, QPoint(window->width() / 2, window->height() / 2)); @@ -1198,9 +1200,9 @@ void tst_QQuickPopup::setOverlayParentToNull() QQuickWindow *window = helper.window; window->show(); - // TODO: Using ignoreMessage() fails in CI with macOS for release builds, - // so for now we let the warning through. -// QTest::ignoreMessage(QtWarningMsg, "ShaderEffectSource: 'recursive' must be set to true when rendering recursively."); +#ifdef QT_DEBUG + QTest::ignoreMessage(QtWarningMsg, "ShaderEffectSource: 'recursive' must be set to true when rendering recursively."); +#endif QVERIFY(QTest::qWaitForWindowActive(window)); QVERIFY(QMetaObject::invokeMethod(window, "nullifyOverlayParent")); |