diff options
| author | Jake Petroules <jake.petroules@theqtcompany.com> | 2015-12-02 00:27:49 -0800 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@theqtcompany.com> | 2015-12-02 16:32:12 +0000 |
| commit | 4f1b6749c3f07bfa44b92f8261a03d650f54166b (patch) | |
| tree | a1ecc2d741ef5ef005bafb706ec10151ff4f3da0 /tests/auto/gui | |
| parent | ccc6d545c2511674125adea11dc00d08a34b67b3 (diff) | |
Fix possible null pointer dereferences.
This follows up 130c2baa9376dcf525916620294bd9996bdf41f3.
Change-Id: I2f6c9b4f995af427cec9a2162b782039debf8564
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Diffstat (limited to 'tests/auto/gui')
| -rw-r--r-- | tests/auto/gui/image/qicon/tst_qicon.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/tests/auto/gui/image/qicon/tst_qicon.cpp b/tests/auto/gui/image/qicon/tst_qicon.cpp index 9ed3873682..7333dd739f 100644 --- a/tests/auto/gui/image/qicon/tst_qicon.cpp +++ b/tests/auto/gui/image/qicon/tst_qicon.cpp @@ -53,6 +53,7 @@ private slots: void actualSize2_data(); // test with 2 pixmaps with different aspect ratio void actualSize2(); void isNull(); + void isMask(); void swap(); void bestMatch(); void cacheKey(); @@ -218,6 +219,20 @@ void tst_QIcon::isNull() { QVERIFY(iconSupportedFormat.actualSize(QSize(32, 32)).isValid()); } +void tst_QIcon::isMask() +{ + QIcon icon; + icon.setIsMask(true); + icon.addPixmap(QPixmap()); + QVERIFY(icon.isMask()); + + QIcon icon2; + icon2.setIsMask(true); + QVERIFY(icon2.isMask()); + icon2.setIsMask(false); + QVERIFY(!icon2.isMask()); +} + void tst_QIcon::swap() { QPixmap p1(1, 1), p2(2, 2); |