summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNorwegian Rock Cat <qt-info@nokia.com>2009-05-19 08:39:50 (GMT)
committerNorwegian Rock Cat <qt-info@nokia.com>2009-05-19 11:11:09 (GMT)
commit41ba7d4a000181607004d450a8130be902a42274 (patch)
tree9441f4fcae1c0c548f7e09c28b2cf5b669e637cb
parent071709fb6f3988f29767074c759436cccb33bcc7 (diff)
downloadQt-41ba7d4a000181607004d450a8130be902a42274.zip
Qt-41ba7d4a000181607004d450a8130be902a42274.tar.gz
Qt-41ba7d4a000181607004d450a8130be902a42274.tar.bz2
grabWindow in MacGui test was grabbing the wrong area.
I think grabWindow was borken and we were compensating for it in the auto test. Now that it works as documented our workaround broke. Reviewed-by: Morten Sørvig
-rw-r--r--tests/auto/macgui/tst_gui.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/tests/auto/macgui/tst_gui.cpp b/tests/auto/macgui/tst_gui.cpp
index b302f8b..641e596 100644
--- a/tests/auto/macgui/tst_gui.cpp
+++ b/tests/auto/macgui/tst_gui.cpp
@@ -69,8 +69,7 @@ private slots:
QPixmap grabWindowContents(QWidget * widget)
{
- const int titleBarHeight = widget->frameGeometry().height() - widget->height();
- return QPixmap::grabWindow(widget->winId(), 0, titleBarHeight, -1, widget->height());
+ return QPixmap::grabWindow(widget->winId());
}
/*
@@ -79,10 +78,6 @@ QPixmap grabWindowContents(QWidget * widget)
*/
void tst_gui::scrollbarPainting()
{
-#if defined (Q_WS_MAC) && defined (__i386__)
- QSKIP("This test fails on scruffy when run by the autotest system (but not when you run it manually).", SkipAll);
-#endif
-
ColorWidget colorWidget;
colorWidget.resize(400, 400);