summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui/kernel
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-04-06 09:32:13 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-04-06 09:32:13 +0200
commit1a464f35d19fbf6a5cbe93b2a2d52f2f44465913 (patch)
tree7306fbbb50429d66cf4d3d08e60e7310431b9f85 /tests/auto/gui/kernel
parent061fbceb777c41b23bc2b8180b2af85d9b35b246 (diff)
parentb6f7230cda02d9b11b309816ca1e41dbd2716fe0 (diff)
Merge remote-tracking branch 'origin/5.11' into dev
Diffstat (limited to 'tests/auto/gui/kernel')
-rw-r--r--tests/auto/gui/kernel/qcursor/tst_qcursor.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/gui/kernel/qcursor/tst_qcursor.cpp b/tests/auto/gui/kernel/qcursor/tst_qcursor.cpp
index d505f5a655..eb33cce95b 100644
--- a/tests/auto/gui/kernel/qcursor/tst_qcursor.cpp
+++ b/tests/auto/gui/kernel/qcursor/tst_qcursor.cpp
@@ -93,6 +93,9 @@ void tst_QCursor::equality()
VERIFY_DIFFERENT(bitmapCursor, pixmapCursor);
// Empty pixmap
+ for (int i = 0; i < 18; ++i)
+ QTest::ignoreMessage(QtWarningMsg, "QCursor: Cannot create bitmap cursor; invalid bitmap(s)");
+
QPixmap emptyPixmap;
QCursor emptyPixmapCursor(emptyPixmap);
QCOMPARE(emptyPixmapCursor.shape(), Qt::ArrowCursor);