AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Skip testing empty window sizes on Windows

Browse Source 
Change-Id: Ib4f3bc63196527583a274180c40d0f7847e13f55
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
This commit is contained in:
Jan Arve Saether 2015-11-23 12:22:50 +01:00 committed by Jan Arve Sæther
parent 361e24b79e
commit 118d5dc496
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4562,8 +4562,18 @@ void tst_QWidget::setWindowGeometry_data()
QList<int> windowFlags; QList<int> windowFlags;
windowFlags << 0 << Qt::FramelessWindowHint; windowFlags << 0 << Qt::FramelessWindowHint;
const bool skipEmptyRects = (m_platform == QStringLiteral("windows"));
foreach (QList<QRect> l, rects) { foreach (QList<QRect> l, rects) {
QRect rect = l.first(); QRect rect = l.first();
if (skipEmptyRects) {
QList<QRect>::iterator it = l.begin();
while (it != l.end()) {
if (it->isEmpty())
it = l.erase(it);
else
++it;
}
}
foreach (int windowFlag, windowFlags) { foreach (int windowFlag, windowFlags) {
QTest::newRow(QString("%1,%2 %3x%4, flags %5") QTest::newRow(QString("%1,%2 %3x%4, flags %5")
.arg(rect.x()) .arg(rect.x())
@ -4612,8 +4622,13 @@ void tst_QWidget::setWindowGeometry()
widget.setGeometry(rect); widget.setGeometry(rect);
widget.showNormal(); widget.showNormal();
if (rect.isValid()) if (rect.isValid()) {
QVERIFY(QTest::qWaitForWindowExposed(&widget)); QVERIFY(QTest::qWaitForWindowExposed(&widget));
} else {
// in case of an invalid rect, wait for the geometry to become
// adjusted to the actual (valid) value.
QApplication::processEvents();
}
QTRY_COMPARE(widget.geometry(), rect); QTRY_COMPARE(widget.geometry(), rect);
// setGeometry() while shown // setGeometry() while shown