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-11 15:07:17 +0200 |
commit | 9685d8f97e8bb448c90dd87b4e86c0ea8438436a (patch) | |
tree | aa121f8c81faf6f2ab8785637ac688a148ed1ecd | |
parent | 2da83b321f41ce3a9581447e0209c9b827c2c397 (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>
-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 4d238663..8a8cd143 100644 --- a/tests/auto/qquickpopup/tst_qquickpopup.cpp +++ b/tests/auto/qquickpopup/tst_qquickpopup.cpp @@ -1197,9 +1197,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)); @@ -1215,9 +1217,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")); |