From 4a169ac0156ede6b0757b8e8c6d92ede19ba19d5 Mon Sep 17 00:00:00 2001 From: Fabian Bumberger Date: Thu, 10 Apr 2014 18:04:49 +0200 Subject: QNX: Fix QDockWidget autotest Show translates to showFullScreen on some platforms. This patch replaces show with showNormal in the "task248604_infiniteResize" test. On BlackBerry the test is skipped because all top level windows are forced fullscreen by the platform. Change-Id: Ia974c3fcbd0c71c107f4cc3f8405b8ef79ffb5b7 Reviewed-by: Sergio Ahumada --- tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'tests/auto/widgets') diff --git a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp index 6551a88232..095fa3347d 100644 --- a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp +++ b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp @@ -801,13 +801,16 @@ void tst_QDockWidget::task237438_setFloatingCrash() void tst_QDockWidget::task248604_infiniteResize() { +#if defined Q_OS_BLACKBERRY + QSKIP("Top level window is stretched to fullscreen"); +#endif QDockWidget d; QTabWidget *t = new QTabWidget; t->addTab(new QWidget, "Foo"); d.setWidget(t); d.setContentsMargins(2, 2, 2, 2); d.setMinimumSize(320, 240); - d.show(); + d.showNormal(); QTest::qWait(400); QCOMPARE(d.size(), QSize(320, 240)); } -- cgit v1.2.3