diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-06 09:32:13 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-06 09:32:13 +0200 |
commit | 1a464f35d19fbf6a5cbe93b2a2d52f2f44465913 (patch) | |
tree | 7306fbbb50429d66cf4d3d08e60e7310431b9f85 /tests/auto/gui/kernel | |
parent | 061fbceb777c41b23bc2b8180b2af85d9b35b246 (diff) | |
parent | b6f7230cda02d9b11b309816ca1e41dbd2716fe0 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ic811cd444e523b904211797112bba6aaec85dddd
Diffstat (limited to 'tests/auto/gui/kernel')
-rw-r--r-- | tests/auto/gui/kernel/qcursor/tst_qcursor.cpp | 3 |
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); |