From b942106bb661736264aec69961caecc35c814c09 Mon Sep 17 00:00:00 2001 From: Toby Tomkins Date: Tue, 7 Feb 2012 14:08:53 +1000 Subject: [PATCH] Remove SVG specific tests and testdata from QIcon. SVG support is now handled in QtSvg. Previously this test code would normally be skipped when testing qtbase. This code is only executed when testing qt5 with QtSvg enabled. This code will be moved to QtSvg. Task-number: QTBUG-22360 Change-Id: I7372012469f9c0f9b7d3851a0ae696f8f935ba10 Reviewed-by: Jason McDonald Reviewed-by: Rohan McGovern --- tests/auto/gui/image/qicon/heart.svg | 55 -------------- tests/auto/gui/image/qicon/heart.svgz | Bin 1506 -> 0 bytes tests/auto/gui/image/qicon/rect.svg | 76 -------------------- tests/auto/gui/image/qicon/trash.svg | 58 --------------- tests/auto/gui/image/qicon/tst_qicon.cpp | 88 ----------------------- 5 files changed, 277 deletions(-) delete mode 100644 tests/auto/gui/image/qicon/heart.svg delete mode 100644 tests/auto/gui/image/qicon/heart.svgz delete mode 100644 tests/auto/gui/image/qicon/rect.svg delete mode 100644 tests/auto/gui/image/qicon/trash.svg diff --git a/tests/auto/gui/image/qicon/heart.svg b/tests/auto/gui/image/qicon/heart.svg deleted file mode 100644 index 8c982cd93c..0000000000 --- a/tests/auto/gui/image/qicon/heart.svg +++ /dev/null @@ -1,55 +0,0 @@ - - - - - -Heart Left-Highlight -This is a normal valentines day heart. - - -holiday -valentines - -valentine -hash(0x8a091c0) -hash(0x8a0916c) -signs_and_symbols -hash(0x8a091f0) -day - - - - -Jon Phillips - - - - -Jon Phillips - - - - -Jon Phillips - - - -image/svg+xml - - -en - - - - - - - - - - - - - - - diff --git a/tests/auto/gui/image/qicon/heart.svgz b/tests/auto/gui/image/qicon/heart.svgz deleted file mode 100644 index 0f0913ffa7f06603ee97906415ae90ac61868272..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1506 zcmV<81s(byiwFqO@{vdY188Moa&$5-b9QF{wO3n@(>N4<=T~?$FCZGncH+b-)1rkD zf)z*zSnbP5C{5fZOBzRU+D`fP9OqVdrpqqNZe}_YpZn#reR}=;Zd;Wjg+noM zkgQUb71d_p{Ql{cD;%WTq{@;~RdV4}%6Yzgbp4C#qL+?g&8)KAgjcfa_cqo4j2(BA{4^I1205 zK}EK3K#juNU~fJJOmIM+rh5%RLd-RM=9x-YiH1;L&Tns2y4%XC)d(^`A7$G@Ui$Vo zRiXEJQIQ9-%OA5TCY2ATvt9Pqyp^ejfzN%ykzH(`VOSx{{98xGv z8W@7MWUZKe=0Mf5HeWbA=9opC$0k$gMWw;mse%W;s~r@Hc%8XUWS*ucDY?Rp)N0qH zeVx=EWM z=7NN)k5!x8xs|>e^~T~%%9F!Bp*2{MxRR}R^XbMLrCoxvHk)khH{UH8pmi(TBum-^ zULlV8hnrXbUmbtA6cALJ&i_!&7i5Au?a-WF{sm#+=F&|8D9*CV>Fy@}mP zW>Tk3QMUlG<)^&R2!0b(sb-tN22V-|w5X&;S#m@jT5)H=R_p8l&<)^+QoTqv!&_M_ zb5$0ge(eqGiE%RjkoO(whpar&`D1b?5)#vtJo&yrm|hUj#ir7qVYh$Q$L&g$7b3E4 ztS>n^&(S;8!8@xDEb85=EOaiLzKOqXAThg(77kPm=W2hb7(kr$*FKNV`s$5F2j{jw zSf=I#R<`qhW%XnR7L5Uy{#lcg6$3H2C6+zd%v(oW8(g-_Vw-HF*`-fm^K>EuqxX4) z`@~dp+?N-3VU}(SBk6r?A+R^bqT}`PmqjWo{TDVaZTR=5zUhtHCPmd5fhfwP+U&sS zQdV7r)4I>vY~0@4Tg%(M{{Nk;-asuINJania6d@6p0ZtPcJG+;4;#5DblViG-Om}3 zO|ehfVlPcSbZ5sq)nwd8aPpd0>pafnT6Z_RdGR~F>Bck{PG*J$v{Fqbn^cvmSvXf= z_c#Mp!IcC67={;P%3S}}u#oPW29W8N$x(uO_sl9bR~aK z)J>yy^;Tta;90CPS;=zYyftJ*4fg8A5Gmi9yqL=2MDj}ePv?8B1GID-Mq_o+aBL~$GmMrI)wIN*NFKs(?u z=9~oqNCFl(;UNkM!8{-kPartvaqKgTX8S%-$0!BjL5L$k#3`Ey1!9u3@(z54gO~}M z>c=o`z#pJNtvC&RYDMmo0Q>M5ZJ#qNXcU|z3Gyk$LFh-e?@KlRiu$c&Iult#Yy}-P zhbLs@TQom9 z`L?KRjFN>@Hqn?31Tf|uo$@wRh?n1&jN^!kjur+nWk54|joKj(S*J~6%vj)ufFr1P z1W6!+W3@zRuN(GYELlGK2D*-k I&LIx~04I6ZF8}}l diff --git a/tests/auto/gui/image/qicon/rect.svg b/tests/auto/gui/image/qicon/rect.svg deleted file mode 100644 index 8eb24727be..0000000000 --- a/tests/auto/gui/image/qicon/rect.svg +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/tests/auto/gui/image/qicon/trash.svg b/tests/auto/gui/image/qicon/trash.svg deleted file mode 100644 index c44e4c75a2..0000000000 --- a/tests/auto/gui/image/qicon/trash.svg +++ /dev/null @@ -1,58 +0,0 @@ - - - - - -Keep Tidy Inside - - - - -symbol -bin -signs_and_symbols -clean -rubish -trash -inside -garbage -sign - - - - -Martin Owens - - - - -Martin Owens - - - - -Martin Owens - - - -image/svg+xml - - -en - - - - - - - - - - - - - - - - - diff --git a/tests/auto/gui/image/qicon/tst_qicon.cpp b/tests/auto/gui/image/qicon/tst_qicon.cpp index 7d455f1010..4a9ab93921 100644 --- a/tests/auto/gui/image/qicon/tst_qicon.cpp +++ b/tests/auto/gui/image/qicon/tst_qicon.cpp @@ -58,13 +58,11 @@ private slots: void actualSize(); void actualSize2_data(); // test with 2 pixmaps with different aspect ratio void actualSize2(); - void svgActualSize(); void isNull(); void swap(); void bestMatch(); void cacheKey(); void detach(); - void svg(); void addFile(); void availableSizes(); void name(); @@ -181,28 +179,6 @@ void tst_QIcon::actualSize2() QCOMPARE(icon.pixmap(argument).size(), result); } -void tst_QIcon::svgActualSize() -{ - if (!haveImageFormat("svg")) { - QSKIP("SVG support is not available"); - } - - const QString prefix = QFileInfo(QFINDTESTDATA("icons")).absolutePath() + "/"; - QIcon icon(prefix + "rect.svg"); - QCOMPARE(icon.actualSize(QSize(16, 16)), QSize(16, 2)); - QCOMPARE(icon.pixmap(QSize(16, 16)).size(), QSize(16, 2)); - - QPixmap p(16, 16); - p.fill(Qt::cyan); - icon.addPixmap(p); - - QCOMPARE(icon.actualSize(QSize(16, 16)), QSize(16, 16)); - QCOMPARE(icon.pixmap(QSize(16, 16)).size(), QSize(16, 16)); - - QCOMPARE(icon.actualSize(QSize(16, 14)), QSize(16, 2)); - QCOMPARE(icon.pixmap(QSize(16, 14)).size(), QSize(16, 2)); -} - void tst_QIcon::isNull() { // test default constructor QIcon defaultConstructor; @@ -395,54 +371,6 @@ void tst_QIcon::detach() QVERIFY(img1 == img2); } -void tst_QIcon::svg() -{ - if (!haveImageFormat("svg")) { - QSKIP("SVG support is not available"); - } - QIcon icon1("heart.svg"); - - QVERIFY(!icon1.pixmap(32).isNull()); - QImage img1 = icon1.pixmap(32).toImage(); - QVERIFY(!icon1.pixmap(32, QIcon::Disabled).isNull()); - QImage img2 = icon1.pixmap(32, QIcon::Disabled).toImage(); - - icon1.addFile("trash.svg", QSize(), QIcon::Disabled); - QVERIFY(!icon1.pixmap(32, QIcon::Disabled).isNull()); - QImage img3 = icon1.pixmap(32, QIcon::Disabled).toImage(); - QVERIFY(img3 != img2); - QVERIFY(img3 != img1); - - QPixmap pm("image.png"); - icon1.addPixmap(pm, QIcon::Normal, QIcon::On); - QVERIFY(!icon1.pixmap(128, QIcon::Normal, QIcon::On).isNull()); - QImage img4 = icon1.pixmap(128, QIcon::Normal, QIcon::On).toImage(); - QVERIFY(img4 != img3); - QVERIFY(img4 != img2); - QVERIFY(img4 != img1); - - QIcon icon2; - icon2.addFile("heart.svg"); - QVERIFY(icon2.pixmap(57).toImage() == icon1.pixmap(57).toImage()); - - QIcon icon3("trash.svg"); - icon3.addFile("heart.svg"); - QVERIFY(icon3.pixmap(57).toImage() == icon1.pixmap(57).toImage()); - - QIcon icon4("heart.svg"); - icon4.addFile("image.png", QSize(), QIcon::Active); - QVERIFY(!icon4.pixmap(32).isNull()); - QVERIFY(!icon4.pixmap(32, QIcon::Active).isNull()); - QVERIFY(icon4.pixmap(32).toImage() == img1); - QIcon pmIcon(pm); - QVERIFY(icon4.pixmap(pm.size(), QIcon::Active).toImage() == pmIcon.pixmap(pm.size(), QIcon::Active).toImage()); - -#ifndef QT_NO_COMPRESS - QIcon icon5("heart.svgz"); - QVERIFY(!icon5.pixmap(32).isNull()); -#endif -} - void tst_QIcon::addFile() { QIcon icon; @@ -506,22 +434,6 @@ void tst_QIcon::availableSizes() QCOMPARE(availableSizes.at(0), QSize(16,16)); } - if (haveImageFormat("svg")) { - // checks that there are no availableSizes for scalable images. - QIcon icon("heart.svg"); - QList availableSizes = icon.availableSizes(); - QVERIFY(availableSizes.isEmpty()); - } - - if (haveImageFormat("svg")) { - // even if an a scalable image contain added pixmaps, - // availableSizes still should be empty. - QIcon icon("heart.svg"); - icon.addFile("image.png", QSize(32,32)); - QList availableSizes = icon.availableSizes(); - QVERIFY(availableSizes.isEmpty()); - } - { // we try to load an icon from resources QIcon icon(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-open-16.png"));