From d309574c03820beeb60f668fdace1817106b0bd9 Mon Sep 17 00:00:00 2001
From: Sergio Ahumada <sergio.ahumada@digia.com>
Date: Mon, 15 Jul 2013 05:10:17 -0700
Subject: [PATCH] tst_QIcon: Fix availableSizes() and
 task223279_inconsistentAddFile()

Copy some needed files into a local folder when QtWidgets is not
available.

Task-number: QTBUG-31993
Change-Id: I93b65bda198c22a60e979c119de8de683a78bb53
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
---
 .../images/standardbutton-open-128.png        | Bin 0 -> 5415 bytes
 .../images/standardbutton-open-16.png         | Bin 0 -> 629 bytes
 .../images/standardbutton-open-32.png         | Bin 0 -> 1154 bytes
 .../images/standardbutton-save-128.png        | Bin 0 -> 4398 bytes
 .../images/standardbutton-save-16.png         | Bin 0 -> 583 bytes
 .../images/standardbutton-save-32.png         | Bin 0 -> 1092 bytes
 tests/auto/gui/image/qicon/tst_qicon.cpp      |  42 ++++++++----------
 tests/auto/gui/image/qicon/tst_qicon.qrc      |   6 +++
 8 files changed, 24 insertions(+), 24 deletions(-)
 create mode 100644 tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-open-128.png
 create mode 100644 tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-open-16.png
 create mode 100644 tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-open-32.png
 create mode 100644 tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-save-128.png
 create mode 100644 tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-save-16.png
 create mode 100644 tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-save-32.png

diff --git a/tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-open-128.png b/tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-open-128.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a052e829dce852791782cddb63573c68d3ab40b
GIT binary patch
literal 5415
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
R`mF!}002ovPDHLkV1mrlMqU5_

literal 0
HcmV?d00001

diff --git a/tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-open-16.png b/tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-open-16.png
new file mode 100644
index 0000000000000000000000000000000000000000..08cdc2b91f70a81b24ececf280ec2fb849173015
GIT binary patch
literal 629
zcmV-*0*d{KP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS0000PbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$S2T4RhR5;6x
zlTB+=K^TRf`M60MiBg+lgDynsUKIaDp*vl>)`cSe54#i>QWq|CXEzG&EOn(tT$HvF
zTl$rdHffq(Z|=P_^SVf_A1x&ZhJk@|c-}L-N<{cDGyQDx_Vk_Lb3tiP8bQTN3$O1_
zJ$d(*Go(a>9}6#9qous6OoY-AXp1rhn(f1tot01TmDYfQqkF$u|2Xw{?#*#Peg1iC
z?0oS!K<Nlfgei@pOaZh7Wl_eUl;xn?>CHX8d-L8*{ksN0TeK~q{yN&0kl>JzLvSc@
zAOR4H<x0gC%2)r4@abi1ygFJP;71Hd>@kVb5sms6db@SBviK0_HkLof`;B=!Xu_au
ziFRX+xZ474P|AQZpbfp<4KCF#GjYx#Apv0G+Lc>dd*d|=ptPm2zJz2ws$&;VG(CP{
z64zcPi2vu^Io})*XhYVIsklx0%?*ZC?o?wypbU8$ljg}#MiGzqLT|6PY60>*RpL_8
z^z?w>9TFVD=LDbOvObxrg#Au))&d-~)`~?*Nc#yQ0iUIWkmFrO@D4;yg#M%uZ?Aq`
zv;ZzoqO7?}p2p<qA##f0fBDFC9=`Ho0s7q?6Yp*z!4F*^#o{Kw?-5j<Btv^c2$aW0
zzA@Mk^z5VS>xIbHWEgfJ*pclAGmAGmv2+w*fErK+j@It%Uj!V`7LoQZv<L?{`M9^d
P00000NkvXXu0mjf$*vo_

literal 0
HcmV?d00001

diff --git a/tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-open-32.png b/tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-open-32.png
new file mode 100644
index 0000000000000000000000000000000000000000..db33c7985266578402e12484b4d5f63c0daa91e4
GIT binary patch
literal 1154
zcmV-|1bzF7P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000C@Nkl<ZcwV(v
zOK%%h6#mY5#-2EFQlij60R=&Uv{H*$qzkA-iz>u|4Tx8PNGMwb${%PEu;w9wS|Jv&
zLZGgS)S^H^Pzlr$A_Pimku(WO^Ku?`>gPP}gYmUTV|U_^sP-papQGckzVF;~&b?!j
zQlgBrLy6-tv;EAzM;`As%!H<b<bNouJgbm#R<8e^%w|$U!(Z`v+$MD2iN@j|z4rd)
zeqnDyG8-VOkdp?Yss({`6EfPh@4_d8BOkvSIp~RyO%c#{_{3gO+JK$<6QD?iuxg=2
zK%Vtu6iwiXm)`69`rW4v0r<Nq0=o9@H@KAsG{YxTLP*oXg1Cb{y@%Qk9zFT}4`&Af
z3d&TEAilXW>D*kK`!SzcE|*S*1c0bYsMnDxUyB5SeCwof?B&zFwWR`4MLZ}}LekqX
zH~!Nr-+uVwX8^8*1ppONO$XJIX|>r0aaKr$Vo<-=0$-8)u`GHY7%&sv_dMND05pFG
zJli<?x_CGi2nv#@`k?YNigVi%gw<=?G^VmaEc|RBOpxN)T0ljeYQp-g8fWj5_}0%<
z2#)m|*T7uIA7QnaAULI5pEth80OY)89IM*_3N>MftU;#1#QgEyr${eMpy%FxM9mJ|
zih&b@uM_BGVROm(;?27*H|T+eBe-p2Ui<AEm~9<+^0~L+ZcIWj3t>Pjuh^qUjn$=@
z$LdPpPXQ!hE_nruQ&;O}nyB6aH9q0y>I|M4d<VtZOZY$VLJC3%XUiQJyYwYuUM2(2
z4yzLE6uJ>dY4##^0;zYxwF-;A08n)bgd}8EW^nxZw@{iskKMq=&as)zl`po7p%SE1
z|DyN7BgoJH3dvox3ablKPBybT5-P#!`~>d2?*QD5t7s+G7AGA5e}#5n?M4#!_a8wn
z#n3WD+F)f<MeiJ_X+lyvpbif^Jq^a1zx~W9!YO7!W)GNaFNID*=DN_$4&+yokes0z
zkb;%T;95Bd=BSt@ED6#sgzkd%#U#4#-VfKF**Sp}mBo3*3SM5y=gi(Rk$j=V))xLb
z7rG5srpJ)zyaVnsYs3c5957}nE4d3PC3cH^Hp94Ujn@ev5Z33%(e=;)ly0d%b1g8t
z1kP<pA#gh&O@{<oUIX&b4sgzpU7mnoOl9V&ET2{of}vT^jCPR57J}<I$ddG^=@F(?
z#*UR!wQM$QS4cC_GZGR|%B7?29ea>po>I-zDp<B)x=!ap0*cvGj0%h3b`h<F?OJRu
zd44o3AhT>3?wT5>R)P$}+VZvBDP|-|i_k)F0qAk_dgz^yi1af<oz9-FgsEv7S^*&h
z@<p4Ej{f|{3#UkzQZglgh%^9Q6SKMD!w<(lh{fY=XaS@oXKG!Z{`?o|0O$a)>0d!g
z0Dx`)aR5d&Mm0-fcOaj)W^n)xfD(YTlu`-MJx35xw)#b+;UB!+LpF#p0InbS52>r|
UjGNLdr2qf`07*qoM6N<$g5^dZz5oCK

literal 0
HcmV?d00001

diff --git a/tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-save-128.png b/tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-save-128.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc6fd7ce1da507cd96a8f7c43676644a8ed22818
GIT binary patch
literal 4398
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

literal 0
HcmV?d00001

diff --git a/tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-save-16.png b/tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-save-16.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd4e228280f8c65815da977c295cfa62a7204f6d
GIT binary patch
literal 583
zcmV-N0=WH&P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS0000PbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$R*-1n}R5;6>
zlFMroQ5431nVF<X`Y^GNG$=-;6mjW7*FHBz!F5Ht5-jM(|G<^5T#L}ZKycwwS4F$i
zg`nc12wH0_q|Ia6%-p&692ZT}REruvIB?;>cfQ9>sVWz4FI_%8Q+_;_^(RjqpUChl
zbnp3Ybz^6%75#YiX7$piXZO|ufTPog7iVTqo~Tu;+?+eZpK$lli_Ap1T)247dkD;X
z0D<rMPWdN@3LEt{xuGBr;4vUn73Uo2?!|!#M3f}4y;ufU&>`S|2}A^&So9zZB7aZP
zT1%27y=sI0Wi5jHOUnel4=5sv>fY3wZK@4}b%J&ng8u92{0Q&YYsBqsL<Hvqae{M>
zu3*pec0=q}peU&D<?|X-dBgd$BQ)w;1nD%HOdewlD<7J)b4U30^*heV?=^}lq+q(3
z=HuJfEH2#O<@2W$a+c9_L}}D8K3)L8m}I{NReFAt#3CjJAdVv%^*Uj=O{*EhA#hGG
zvDt4S+=-&B-z6}VrzW|2ZH`K%Lanw*7=|=k${66BBZ>{(9#g7HarR2-`uwfs%uuE@
zoR;By7MyjsPJq^0;zaSX#kkc94Jxgy+gy0^;Lb`4NCC%yF~IN3C3Vn8>>CTL{{+nV
V60b<PSF`{C002ovPDHLkV1f{f48Z^Z

literal 0
HcmV?d00001

diff --git a/tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-save-32.png b/tests/auto/gui/image/qicon/styles/commonstyle/images/standardbutton-save-32.png
new file mode 100644
index 0000000000000000000000000000000000000000..177678c96314c05646862f97c849d8e94e14db6b
GIT binary patch
literal 1092
zcmV-K1iSl*P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000CFNkl<ZcwWSm
zy-EW?6ot>MyNd)75vvqpVebp*3y5HAZRrE3FQ6%`Or@=rVC!EkwjvRm7}QmiKsHe#
zE@XA*9wD2-1+kEooexem&6)4c9Yqp`>BX%D&vQ3HjEG2SVyrYe?7JE{2wx-hkw_bW
zD5b7@y?EvRX#EKWlKo80SNxf!YU`rW;zJm*{@CG5H)3AuLCD)?mv_xK?j6@Sx4d&g
z5+)A5DNmNi{h%FV`|t*9yJtAR43L-A>M1t%Yp5Jtq0#w-?>e){;39)J<ftf4@V^ig
z0Tu8ZzQc1J4;dU3fKVX9eh8r00t7@jC?P+NT@-*Bf!VmiN5E9S9RnP^0SKVASTex$
z_F|;~39TiKXgdZ(#GU~H83SU;fEE)A{{YhwKq=_It)W7q1vyEz3jy#~17Dq&zi-n(
z6vw}p)HH44&?adM0#qnPNQDt5RzwH>1Qtei#scNXj*u9c5E2pt5(BItu>nH?0Yl5u
zs%g}U7PUzo`+OJk^v-A5a+RPy>8p1>JAR*g@7-BB(CUqGJb$}{Gbd{F1uNn(w((~V
zf7?FBM_g#F8KyW0!0ubOT0yrlg}cu_GCfTt_dwz`8E>vxU~iw%<SJuhnI0Gnkh}<J
zOx97Ks4<W|OcH53=J~kOb*x_A_srOd{;LEgVAt!S+1x^VcMnSGWaT~b_KfEl2DW2?
zQprI?UK9k%<q-p^4I~PE03sksqvv_}^65Lur6R6etYdnr%<~6jLu>05)m-Akw_Ti@
zJCAmIAM0x^G$v{`JN*DGgbA?O+Q#hcG&a}QaO2tx&#f%~MyJz>8%optSqLGZl!6LF
zgyh3;2+Pebj*huFdFnV?%}q$DC|d-eG~g8a1DJHebS!nhNFAjQ79Zi~k6*C%>h(*w
zuA2%T^0<gN-DILr;LK1N7#tA&05V-{dCUrx=9;HX`T+vRL1;5Tl2Sr(AZr|$0o34g
zAlY85m<Upa<|R=Uz?TwE5O81;f<Q8W)>%+(b`66>eF02#rnLa%IRO7S%C0~LKK!8~
z2Q@MfT07}ojh@mLVDQI?S5L$V0Kfr!-)FFt@to&%Q}RH{1?t(eK<U0E*je4!4o){p
z_`FO2NHV~IsK!{lzW^CZ8Y=`++U=UnfFD4qQmzN6EDRwaq8xxA1K{bacdp-i`tJS0
zt@+C1mDMDN0ReCsdS)+&Drq>9@j(zIQmUFM0X@qln46izcy)B0!Z~qrHUBxKiBSL(
zq|sxSZ_b~+aOq)rWVl3Fg87iQC^tw?2y-UJSGIX-)!`k#wRHQ<izi<Jc%&^0-~won
zDkLY)jL7uK;T0JrV@;A4!1lm?47*1vW|oq*!Xbj@b7dex(*8fDj<z<Y3$OJ60000<
KMNUMnLSTY4$Lp~G

literal 0
HcmV?d00001

diff --git a/tests/auto/gui/image/qicon/tst_qicon.cpp b/tests/auto/gui/image/qicon/tst_qicon.cpp
index 6c62d6f1b4..2ce6fc5058 100644
--- a/tests/auto/gui/image/qicon/tst_qicon.cpp
+++ b/tests/auto/gui/image/qicon/tst_qicon.cpp
@@ -375,32 +375,32 @@ void tst_QIcon::detach()
 void tst_QIcon::addFile()
 {
     QIcon icon;
-    icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-16.png"));
-    icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-32.png"));
-    icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-128.png"));
-    icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-save-16.png"), QSize(), QIcon::Selected);
-    icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-save-32.png"), QSize(), QIcon::Selected);
-    icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-save-128.png"), QSize(), QIcon::Selected);
+    icon.addFile(QLatin1String(":/styles/commonstyle/images/standardbutton-open-16.png"));
+    icon.addFile(QLatin1String(":/styles/commonstyle/images/standardbutton-open-32.png"));
+    icon.addFile(QLatin1String(":/styles/commonstyle/images/standardbutton-open-128.png"));
+    icon.addFile(QLatin1String(":/styles/commonstyle/images/standardbutton-save-16.png"), QSize(), QIcon::Selected);
+    icon.addFile(QLatin1String(":/styles/commonstyle/images/standardbutton-save-32.png"), QSize(), QIcon::Selected);
+    icon.addFile(QLatin1String(":/styles/commonstyle/images/standardbutton-save-128.png"), QSize(), QIcon::Selected);
 
 #ifndef Q_OS_WINCE
     QVERIFY(icon.pixmap(16, QIcon::Normal).toImage() ==
-            QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-16.png")).toImage());
+            QPixmap(QLatin1String(":/styles/commonstyle/images/standardbutton-open-16.png")).toImage());
     QVERIFY(icon.pixmap(32, QIcon::Normal).toImage() ==
-            QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-32.png")).toImage());
+            QPixmap(QLatin1String(":/styles/commonstyle/images/standardbutton-open-32.png")).toImage());
     QVERIFY(icon.pixmap(128, QIcon::Normal).toImage() ==
-            QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-128.png")).toImage());
+            QPixmap(QLatin1String(":/styles/commonstyle/images/standardbutton-open-128.png")).toImage());
     QVERIFY(icon.pixmap(16, QIcon::Selected).toImage() ==
-            QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-save-16.png")).toImage());
+            QPixmap(QLatin1String(":/styles/commonstyle/images/standardbutton-save-16.png")).toImage());
     QVERIFY(icon.pixmap(32, QIcon::Selected).toImage() ==
-            QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-save-32.png")).toImage());
+            QPixmap(QLatin1String(":/styles/commonstyle/images/standardbutton-save-32.png")).toImage());
     QVERIFY(icon.pixmap(128, QIcon::Selected).toImage() ==
-            QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-save-128.png")).toImage());
+            QPixmap(QLatin1String(":/styles/commonstyle/images/standardbutton-save-128.png")).toImage());
 #else
     // WinCE only includes the 16x16 images for size reasons
     QVERIFY(icon.pixmap(16, QIcon::Normal).toImage() ==
-            QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-16.png")).toImage());
+            QPixmap(QLatin1String(":/styles/commonstyle/images/standardbutton-open-16.png")).toImage());
     QVERIFY(icon.pixmap(16, QIcon::Selected).toImage() ==
-            QPixmap(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-save-16.png")).toImage());
+            QPixmap(QLatin1String(":/styles/commonstyle/images/standardbutton-save-16.png")).toImage());
 #endif
 }
 
@@ -437,11 +437,8 @@ 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"));
+        QIcon icon(QLatin1String(":/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));
     }
@@ -449,7 +446,7 @@ void tst_QIcon::availableSizes()
     {
         // load an icon from binary data.
         QPixmap pix;
-        QFile file(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-16.png"));
+        QFile file(QLatin1String(":/styles/commonstyle/images/standardbutton-open-16.png"));
         QVERIFY(file.open(QIODevice::ReadOnly));
         uchar *data = file.map(0, file.size());
         QVERIFY(data != 0);
@@ -629,18 +626,15 @@ void tst_QIcon::fromTheme()
 void tst_QIcon::task223279_inconsistentAddFile()
 {
     QIcon icon1;
-    icon1.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-16.png"));
+    icon1.addFile(QLatin1String(":/styles/commonstyle/images/standardbutton-open-16.png"));
     icon1.addFile(QLatin1String("IconThatDoesntExist"), QSize(32, 32));
     QPixmap pm1 = icon1.pixmap(32, 32);
 
     QIcon icon2;
-    icon2.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/standardbutton-open-16.png"));
+    icon2.addFile(QLatin1String(":/styles/commonstyle/images/standardbutton-open-16.png"));
     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());
diff --git a/tests/auto/gui/image/qicon/tst_qicon.qrc b/tests/auto/gui/image/qicon/tst_qicon.qrc
index 7925a33c84..469a0a21b4 100644
--- a/tests/auto/gui/image/qicon/tst_qicon.qrc
+++ b/tests/auto/gui/image/qicon/tst_qicon.qrc
@@ -16,5 +16,11 @@
 <file>./icons/themeparent/index.theme</file>
 <file>./icons/themeparent/scalable/actions/address-book-new.svg</file>
 <file>./icons/themeparent/scalable/actions/appointment-new.svg</file>
+<file>./styles/commonstyle/images/standardbutton-open-16.png</file>
+<file>./styles/commonstyle/images/standardbutton-open-32.png</file>
+<file>./styles/commonstyle/images/standardbutton-open-128.png</file>
+<file>./styles/commonstyle/images/standardbutton-save-16.png</file>
+<file>./styles/commonstyle/images/standardbutton-save-32.png</file>
+<file>./styles/commonstyle/images/standardbutton-save-128.png</file>
 </qresource>
 </RCC>