diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-07-12 14:03:21 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-12 14:03:21 +0200 |
commit | 1866c13b7dd48aa0c6ede1cf7907a2640e9399f8 (patch) | |
tree | 0b61c2d801525228f4c5795795d1cdeb57b3edfa /tests/auto/gui/image/qicon | |
parent | 5b648d4d79d07a7c851ce6211ffff8375d41bfa2 (diff) | |
parent | 3ef6cf060e984bca43956a23b61b32ec7347cfc7 (diff) |
Merge "Merge branch 'stable' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/gui/image/qicon')
-rw-r--r-- | tests/auto/gui/image/qicon/tst_qicon.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/gui/image/qicon/tst_qicon.cpp b/tests/auto/gui/image/qicon/tst_qicon.cpp index c21f725b55..6c62d6f1b4 100644 --- a/tests/auto/gui/image/qicon/tst_qicon.cpp +++ b/tests/auto/gui/image/qicon/tst_qicon.cpp @@ -439,6 +439,9 @@ void tst_QIcon::availableSizes() // we try to load an icon from resources QIcon icon(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-16.png")); QList<QSize> availableSizes = icon.availableSizes(); +#ifdef QT_NO_WIDGETS + QEXPECT_FAIL("", "See QTBUG-31993", Abort); +#endif QCOMPARE(availableSizes.size(), 1); QCOMPARE(availableSizes.at(0), QSize(16, 16)); } @@ -635,6 +638,9 @@ void tst_QIcon::task223279_inconsistentAddFile() icon2.addFile(QLatin1String("IconThatDoesntExist")); QPixmap pm2 = icon1.pixmap(32, 32); +#ifdef QT_NO_WIDGETS + QEXPECT_FAIL("", "See QTBUG-31993", Abort); +#endif QCOMPARE(pm1.isNull(), false); QCOMPARE(pm1.size(), QSize(16,16)); QCOMPARE(pm1.isNull(), pm2.isNull()); |