1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix tst_QWidget for platform "offscreen"

Browse Source 
Some features are not implemented by "offscreen" platform. Skip tests
failing because of that. Some failing cases are also already skipped or
blacklisted on "xcb" platform.

Change-Id: I17269169379c270bd7d6f2ddda03ad9b114a71ce
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
This commit is contained in:
Sami Nurmenniemi 2017-03-31 12:45:29 +03:00
parent 36553f8efe
commit ba21e42463
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/auto/widgets/kernel/qwidget/BLACKLIST
View File

@ -5,6 +5,7 @@ ubuntu-16.04
[saveRestoreGeometry]
ubuntu-14.04
ubuntu-16.04
b2qt
[restoreVersion1Geometry]
ubuntu-14.04
osx

13
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
View File

@ -2179,6 +2179,8 @@ void tst_QWidget::showMinimizedKeepsFocus()
QSKIP("QTBUG-26424");
if (m_platform == QStringLiteral("wayland"))
QSKIP("Wayland: This fails. Figure out why.");
if (m_platform == QStringLiteral("offscreen"))
QSKIP("Platform offscreen does not support showMinimized()");
//here we test that minimizing a widget and restoring it doesn't change the focus inside of it
{
@ -3235,6 +3237,9 @@ void tst_QWidget::widgetAt()
if (m_platform == QStringLiteral("wayland"))
QSKIP("Wayland: This fails. Figure out why.");
if (m_platform == QStringLiteral("offscreen"))
QSKIP("Platform offscreen does not support lower()/raise() or WindowMasks");
Q_CHECK_PAINTEVENTS
const QPoint referencePos = m_availableTopLeft + QPoint(100, 100);
@ -3651,7 +3656,7 @@ void tst_QWidget::optimizedResize_topLevel()
expectedUpdateRegion -= QRect(QPoint(), topLevel.size() - QSize(10, 10));
QTRY_COMPARE(topLevel.gotPaintEvent, true);
if (m_platform == QStringLiteral("xcb"))
if (m_platform == QStringLiteral("xcb") || m_platform == QStringLiteral("offscreen"))
QSKIP("QTBUG-26424");
QCOMPARE(topLevel.partial, true);
QCOMPARE(topLevel.paintedRegion, expectedUpdateRegion);
@ -6796,6 +6801,9 @@ void tst_QWidget::render_task217815()
// Window Opacity is not supported on Windows CE.
void tst_QWidget::render_windowOpacity()
{
if (m_platform == QStringLiteral("offscreen"))
QSKIP("Platform offscreen does not support setting opacity");
const qreal opacity = 0.5;
{ // Check that the painter opacity effects the widget drawing.
@ -7386,6 +7394,9 @@ void tst_QWidget::updateWhileMinimized()
{
if (m_platform == QStringLiteral("wayland"))
QSKIP("Wayland: This fails. Figure out why.");
if (m_platform == QStringLiteral("offscreen"))
QSKIP("Platform offscreen does not support showMinimized()");
#if defined(Q_OS_QNX)
QSKIP("Platform does not support showMinimized()");
#endif