From 8455b13feeb1441bc1b9d615ca8c67d8831c2d8c Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Wed, 17 Aug 2011 15:43:36 +1000 Subject: [PATCH] test: fixed failure of tst_qgridlayout on small screens for non-QWS This test will fail if the window manager doesn't give the widget the geometry it requested. The test was verifying this precondition, but only on QWS. It doesn't make sense to limit this check to QWS, as other platforms can have small screens too. Change-Id: I3fec905c28ac2f85ebfd621f84f2269a673e318e Reviewed-on: http://codereview.qt.nokia.com/3061 Reviewed-by: Qt Sanity Bot Reviewed-by: Kalle Lehtonen --- tests/auto/qgridlayout/tst_qgridlayout.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/auto/qgridlayout/tst_qgridlayout.cpp b/tests/auto/qgridlayout/tst_qgridlayout.cpp index 6753f49fed..921168da8e 100644 --- a/tests/auto/qgridlayout/tst_qgridlayout.cpp +++ b/tests/auto/qgridlayout/tst_qgridlayout.cpp @@ -721,10 +721,8 @@ void tst_QGridLayout::spacingsAndMargins() QSize topsize = toplevel.size(); QSize minimumsize = vbox.totalMinimumSize(); -#if defined(Q_WS_QWS) if (topsize.width() < minimumsize.width() || topsize.height() < minimumsize.height()) QSKIP("The screen is too small to run this test case", SkipSingle); -#endif // We are relying on the order here... for (int pi = 0; pi < sizehinters.count(); ++pi) {