summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2012-11-02 13:59:03 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-12 22:56:46 (GMT)
commite92f1d58fc42785247492078b23286eef2b4e5a3 (patch)
tree62374944f876c89ad1a38d6afbf595a046db85ca
parent492dd97f9b214b661cd45ab178fff316709b6382 (diff)
downloadQt-e92f1d58fc42785247492078b23286eef2b4e5a3.zip
Qt-e92f1d58fc42785247492078b23286eef2b4e5a3.tar.gz
Qt-e92f1d58fc42785247492078b23286eef2b4e5a3.tar.bz2
test: Mark tst_QMdiSubWindow::setOpaqueResizeAndMove as XFAIL
Task-number: QTBUG-26803 Change-Id: I3d4b48353256f982cae8f6d19db98971e46cbdb6 Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
-rw-r--r--tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp b/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp
index a50cd59..76bb67d 100644
--- a/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp
+++ b/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp
@@ -65,6 +65,7 @@
#include "../../shared/util.h"
+#include <QSysInfo>
QT_BEGIN_NAMESPACE
#if defined(Q_WS_X11)
@@ -775,7 +776,12 @@ void tst_QMdiSubWindow::setOpaqueResizeAndMove()
// Leave resize mode
sendMouseRelease(mouseReceiver, mousePosition);
- QCOMPARE(resizeSpy.count(), expectedGeometryCount);
+ int resizeSpyCount = resizeSpy.count();
+#ifdef Q_OS_MAC
+ if ((QSysInfo::MacintoshVersion == QSysInfo::MV_10_6) && (resizeSpyCount != expectedGeometryCount))
+ QEXPECT_FAIL("", "QTBUG-26803", Continue);
+#endif
+ QCOMPARE(resizeSpyCount, expectedGeometryCount);
QCOMPARE(window->size(), windowSize + QSize(geometryCount, geometryCount));
}