From 45f681e8183fc876f5943495edb18edf78f29158 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 22 Aug 2019 10:11:26 +0200 Subject: [PATCH] tst_QStyle: Remove unused baseline images (Windows Vista/macOS) The test contained outdated baseline images for 1) Windows Vista: They were only used for OS version Vista and do not match any more. 2) macOS: They were apparently were not in use any more Remove the testing and image comparison code. Task-number: QTBUG-76493 Change-Id: I91cec5113db8d1845b43f97ad2987e63d9f86ac7 Reviewed-by: Christian Ehrlicher --- .../styles/qstyle/images/mac/button.png | Bin 1785 -> 0 bytes .../styles/qstyle/images/mac/combobox.png | Bin 1808 -> 0 bytes .../styles/qstyle/images/mac/lineedit.png | Bin 953 -> 0 bytes .../widgets/styles/qstyle/images/mac/mdi.png | Bin 3092 -> 0 bytes .../widgets/styles/qstyle/images/mac/menu.png | Bin 1139 -> 0 bytes .../styles/qstyle/images/mac/radiobutton.png | Bin 1498 -> 0 bytes .../styles/qstyle/images/mac/slider.png | Bin 1074 -> 0 bytes .../styles/qstyle/images/mac/spinbox.png | Bin 1299 -> 0 bytes .../styles/qstyle/images/vista/button.png | Bin 722 -> 0 bytes .../styles/qstyle/images/vista/combobox.png | Bin 809 -> 0 bytes .../styles/qstyle/images/vista/lineedit.png | Bin 530 -> 0 bytes .../styles/qstyle/images/vista/menu.png | Bin 646 -> 0 bytes .../qstyle/images/vista/radiobutton.png | Bin 844 -> 0 bytes .../styles/qstyle/images/vista/slider.png | Bin 575 -> 0 bytes .../styles/qstyle/images/vista/spinbox.png | Bin 583 -> 0 bytes tests/auto/widgets/styles/qstyle/qstyle.pro | 5 - tests/auto/widgets/styles/qstyle/testdata.qrc | 19 --- .../auto/widgets/styles/qstyle/tst_qstyle.cpp | 127 ------------------ 18 files changed, 151 deletions(-) delete mode 100644 tests/auto/widgets/styles/qstyle/images/mac/button.png delete mode 100644 tests/auto/widgets/styles/qstyle/images/mac/combobox.png delete mode 100644 tests/auto/widgets/styles/qstyle/images/mac/lineedit.png delete mode 100644 tests/auto/widgets/styles/qstyle/images/mac/mdi.png delete mode 100644 tests/auto/widgets/styles/qstyle/images/mac/menu.png delete mode 100644 tests/auto/widgets/styles/qstyle/images/mac/radiobutton.png delete mode 100644 tests/auto/widgets/styles/qstyle/images/mac/slider.png delete mode 100644 tests/auto/widgets/styles/qstyle/images/mac/spinbox.png delete mode 100644 tests/auto/widgets/styles/qstyle/images/vista/button.png delete mode 100644 tests/auto/widgets/styles/qstyle/images/vista/combobox.png delete mode 100644 tests/auto/widgets/styles/qstyle/images/vista/lineedit.png delete mode 100644 tests/auto/widgets/styles/qstyle/images/vista/menu.png delete mode 100644 tests/auto/widgets/styles/qstyle/images/vista/radiobutton.png delete mode 100644 tests/auto/widgets/styles/qstyle/images/vista/slider.png delete mode 100644 tests/auto/widgets/styles/qstyle/images/vista/spinbox.png delete mode 100644 tests/auto/widgets/styles/qstyle/testdata.qrc diff --git a/tests/auto/widgets/styles/qstyle/images/mac/button.png b/tests/auto/widgets/styles/qstyle/images/mac/button.png deleted file mode 100644 index 7b11325e8745522b5d3e321ccaa8078d98447351..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1785 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 b5=HR`La?@=S1daa00000NkvXXu0mjff-|`e diff --git a/tests/auto/widgets/styles/qstyle/images/mac/mdi.png b/tests/auto/widgets/styles/qstyle/images/mac/mdi.png deleted file mode 100644 index 8c09ae43385ae050f99c414311312392e4f1168c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3092 zcmeH}`#TegAIDRjZ^O~l+$l#1F+$~*rn6jgEfxz6!^+HUiMfVZI>+T`Os-2pE@v(s zbIdKb&83lhY)C5FFqh`Coz~a+JHFo^-kFbAw99 zC4*8YtTztNSV=z%2fzVG-_LpN#DsK0Oq7s~;z^&lN_%Z3`m5`4*uat45z+8~7{t)9 zTO&IlAFDUisBX7P{Y0ZInLq)I@HU%FRg1eU$2;jVJfIq0p14c6LxQoG)w*_1)$MM{ z^!;8tRrp%#JQZ`1-u4na6w#@Mf3`LD#KvUVc(*430HXYk)pI<9cY*PZe!QGJnrfhd zmxey8fM2e1)8_B6LRGKEJn-?k251PLX{1mnHmdOtSX2y_-8$gERU9vTYLj^vV*CsK zRVaM6A>ljK=JZTQypXNA%4!ZBG%}Ak3kpeFG9hmN*5}vL(<3Qz4Z)ZfGGmVE)>RLT zh^yVjea`J{+Ydy$ZWH+4Pb{JO5AWYwdA})2vcC=tooU1_JN4)X&NM;OEY@bQ8~kZ^ zBVBlN`1PK#qo`F*Un%kXca+}C>CibrA&T6-j=vha)3!-heq#BerbegXQkQ9Kw69ja zL&f;ll9Ccsov|;ZtzLy;S2>;vP5NlVu9lgOG+myLh};4})7tAg1Y6r9yy%V6HCA)o zI;XlOE8I?Lz&~MvD)^pq4A{me>GV>TONi=KoCH~D8#Rj8C6Abm`EdkjPQ}a!C@z=i z3d$n^yt}UjWr=OOi&u_`w0c9M)(Qf;=i6fu37enSnRBd%!L700?qIp)x6Drwn5aKR zAIQ8PYjwg@>DIs!eP<|OI#Sk3{ODl-m(YJDYW-V>MEiv<@dMoDbBXWYz1#5d6jsv- z^*(2a4Rv0**49l82D%8DzK;z=O(fG%$DQK85Jz^(-w^N;7Uss@#Unh?o>=v_0arBh zr!Qqs7sb6B)>&Gra&`@Rfg_2xM)5+t#@|z`Faw;xtKb_UA?#t9nU!a^6atp|{2+Y0 z>J}Vbe0w<~QUw(pTuW^Y3csns*gSs6Z|sCUU^5(nSX$Zh7S&tiz6AmcM(cY`kliP` zPb=;s2L6;Cv#lD7-P<7Pdb+`iBi=|uRk&Px4CpbaulpuJJ_%f$qJw^JL}F2e{Tniz%|9 zBlaULPr94cO5r9%u58T8ioOuMJQQ!vw%ozCgx-k3y(f>;+B3{*@$c*uD3 z%lvT8dC7-a7*?)prKfVik|EGK#k$rh%Tk6+SHwEj)N%^IIoY@7vjro-f{LnYPA_T} zJwe4R?2n^Qql1D631_JnTrLQ?>P&{Iyi?zK|DP{co?j~4_weR)=ZJ$?8?c=r*c>w> zqnxG>+~-1*Vqn>(OC_rr11Q@OPSVy)7GH z!_9HIINn3y5Y_2yLmfpyn#TP;LHOvz8&tuY>o3&kq~4UpdW(~3$BvwE9938%AwLf# zkSUy?Dh2r?e3-^H49wIIho0P{IW>hbRkN(Q$i=W?rObXpmcbX2qkT5aih9nD8L))D zqQVGQL2cpkjeia0x-`|qs8{rMo67`<%;0>3;e1zL9PFbPaSMWR>%`Kxx5icJn1e4;N$3D`lT$0En0c`tF-i1 zS%bT@dw=ns-S55{^^kmCG~==k*e_cQ(^3E^(z<@C`@7<$p;~nL2a@Cwt|zY$A{JC5 zP_hSv?|xyDznxy!B7v-JEz54{zlk#=o}*Oh<+<6&Xn);aq-8o5wk^auSRA?6xm!As zl-NuPb_CwbHajh$&t&)yU$)X>H(631nC3sJTWLwG5C;awt$a!p!L&RHCx0VwlW7Pf z{%(?0T8&r4C)w7M_S{dmh6{{hj-aROsYRYlov ztn|l^fgAZaD3n^%bSio!z;kI8_mv3QLxC1o z;$DS)$uTWhOy5Ul%vMh-tIqo=SVPFb|D+UDz}j)>G5lK;Il)6aVcjfG0Y%Gp$&pfC z|C%qv2OEv=?w8u9BCUjmdC|6ru~(6ip?`~vz|YaslkzJkoXtmPXYX(^ z@Y;HMfp)PIZ=v(YCPUR({bV#YL@Co_!Qdv$-d=LbV>{{cRI^51&B2spjd_`jF)0C@C$UjGxq{ q<^H(laqY0Lm^l9b<$sug2zch=wPNZD4R`S7AF{J@vZO$LlK%@Y9FkQ4 diff --git a/tests/auto/widgets/styles/qstyle/images/mac/menu.png b/tests/auto/widgets/styles/qstyle/images/mac/menu.png deleted file mode 100644 index 5dd9111d6985574b252bad895eb141a1fe025beb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1139 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 JPDHLkV1n}Gb<+R< diff --git a/tests/auto/widgets/styles/qstyle/images/vista/button.png b/tests/auto/widgets/styles/qstyle/images/vista/button.png deleted file mode 100644 index a6c45276cac79b524dee471045a1b8c606ce0db1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 722 zcmV;@0xkWCP)qd2^~sf#SU3gFD;U$q`aTQ#cOI1 z)C%to@>$-$<-_;AcaM9orBo`R$=NWgMLZra6beU2M|^DzgvDa9*=)gJ5I{?*R9cM1 z&b77%0s&c;dAk{gVzIcqyj(s!oD7A`0KV<*-JY3gZ*MP`%e>tTgCt4A!^4qC1b_)Z zwOW-VsZy!%7Bdo+N=1^SYPAaOn@B`N#MR1pXo;B{yPEth%@F?sCbb|UrVqBG9`Prh z=yt8ER%0wPEsElFhNq#1PPcPD=IdJ-$`;ez0Pya=bazk=Ds@_Tb=B~;QE^pnZKq+TU(o2Ia!H}F-|g?0TF?n@*n~cBl<{#k9y`G zyl}k^c5(CjEheo-+_})z^J(?{PF>H==dIpu2N8OGu8FyfZ`B>%;APjyuOX5yPUrqx zvsifea;MhZ2zwUbbvcLtBE}r!PiMF81hjG9P~+*$xNm2`K9*dgk%3E3)aH$)&165= zS0Vy2#$X>yF6A!|+@!Tv;|{*6^_=|n=^;b_oui4|sMcbP0iC0Xgf_|79_Mn<$CT@I zB^s3G1;oE|Y9$JSpeRa5N5}5&E>|lfVYk~AMG*u6YKT^=HI+*F{eGv@$=l5^?Cf>0y&q zvN2*yT~_it?9RORX6DV?Hy^7*2rVx!@9pggf&g_cgTY{EYio16-MUaXe50|^<#M&Q zwyN!w#>nUMu~@8dbfo{izyD-%(r7dm3I(;j(ik*NkBp4W&CNB4qDa$pu~<~wCGAlx z7HOImMNtm`gb+fA+Ae7lDQ^0+l{$Y%gY+VVFb-n{4rYhcW`}W{Yqb92;`W+Hie70s zV~joVeGdSn7o1*T;$vL^0Dv*B^$9SMY$}Y>3r_p=CfMIRzo5P5k>Yroi6t-rAXqA= zBF>u<&PYlrNJYHUo14>iSzV^nvzGr6w9EZmU!>?M_e4U7^w{v-<$Sr^005*H9*jpE z^Dyqe{W14t0AR!C%Mg#}-R$Ram|q*~s_ z1P&2G+3jtJMorPOrE8mZ+=9SEldzZ!_6Guh5R#3RL)B1ehh#EowOT7AXXn(^)C5&B zkr0qCJ-x5iV{VJwg1~)_n}zQItMw_kK5(=Bvaxdf8Y)e}aa?zIw_L6|p#~@)EG48x zh%xT4ShwCTemm9R%#wd8gK^($_Up@DE}g-c5ZFp(aW&+Av=7U&0Kl@WQbo?*6R~`X z5<&Z8k~XGZkOygwUWZRIZsZhDT$=cb?fk^-RTA9(TxJ=2vvo8U6_X zgSOD{`@~G&|45N5C6P$r^Di2@iHV6|Fqq9|uh6CIgT-R;`~8YctaEwl|IYtJX-}jm zis$+E_V(S~UA0}(7-qAX=Xr{vbm4H=U@!~~4K+76tL>G>I5;?1U0oFfL5C1x7>4J0 nQ54noN@GwI)zZ@9^?LsR5I37rcE8c+00000NkvXXu0mjfuY`PI diff --git a/tests/auto/widgets/styles/qstyle/images/vista/lineedit.png b/tests/auto/widgets/styles/qstyle/images/vista/lineedit.png deleted file mode 100644 index b2c6ac1ae40a0c4a5e45d00a4a55d0be54845352..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 530 zcmV+t0`2{YP)NT;sosp%8DDfD@(YC zn|4`t-oVvx0yqJ2!PJzL1d}F2RQ%XI7v-a+<-?>ETi96CSr={krp>Okx5B_iVyd8; zh=|pD#u%%$wrRiI0RTWMm19^q`P)_pODdH+jaz?wETd*v0IG>Xm%BahBG-8k;kjNh z+yMZfRjU9;UT)khu7Z(GNUCjjc=z@muKC{(5vQf4Gt#0M)nR^23p~={Jwt>&WX{07 zyg2)<7?Xd&>Oavh?<5fvERqNc7D+@70NfG%eU!w;ixZnnKA+#ecD)#qDJRE=-}vnA Ul+Y31kN^Mx07*qoM6N<$g0}7JzW@LL diff --git a/tests/auto/widgets/styles/qstyle/images/vista/menu.png b/tests/auto/widgets/styles/qstyle/images/vista/menu.png deleted file mode 100644 index b114099cc34835ee9aebd0ce53b2ae1a451ba7d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 646 zcmeAS@N?(olHy`uVBq!ia0vp^aX@Uu!2~3u+I~v_Db50q$YKTtz9S&aI8~cZnt_4I z!qdeuB%|@|tc_i_9RwWQ55Al3U7aa%uGgy3F7e@ktD;%GyO={)t-HX!qd+ytBS!to zDi2YPH|i2sc6OeuJN%2wJTGX?8-dtkW_IhZHC0Y+S#tH$49O>w)~33}&Cr z$$$K8#j016-`d{MTYUIp-uB(s7WF;Oxp!~ho%{J_v$NOUlz#j%LO$Tif(cS0LCsEC z0Uo?w>$6-AS$&9!+jXI}f1dyPtcqn*g1oK@vV3;aThuGUE9&r zQy;u74P}n@nH8Lw&bB&G`MS2ONYBO%G5>z?#;ZF@O6hNSo@l*LVb#@nJ+Hk!ah*To z$M?56)bw35`_o6UJv%mLJUf_`YgzWjjraU4%Po>eBb4~!?do3bJ)*}j-)*kZn%7_U z*~~s;yIh0o?x{t~THMT4S4=JCf%=YXrK6&$#uBzxWG|l*Q0Kb4Y^5Tbc_4#;{ll%X z%XoNCNhUab-0}6~azTlliko4dCw4Z)tZ!QGo-F(Ip`S>~zd2R zB3Jn@*0k|!GJ2BU6Ylb8dED9`A9vfeylvT)u}Gm<&S|aDi%SK-S}6gvv8}PNuUKUva_b_w-@32e|A6D{P*v+-F{no{f%Uo)D%I6kkHg>>Fp=v ZmnCa#H@)^H1emZGJYD@<);T3K0RYYaA29#` diff --git a/tests/auto/widgets/styles/qstyle/images/vista/radiobutton.png b/tests/auto/widgets/styles/qstyle/images/vista/radiobutton.png deleted file mode 100644 index c8aa7864dfd07e8ed3abb253815d2308ff243245..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 844 zcmV-S1GD^zP)mLO=$Q` z=Xd@-ouA&lcRs4oXuy=~p}Oq_{0~fncmq7>j|d_8LZMVDRjXA1uv)DymrHQFXJ%$@ zZ+VjerPRb`vzeA8yWNgB&StX#K&4W_#p2P?(XuEq408pSI3}*crW8bfRdSb50RSOn zE1l*M@;&xd>z}uGcDHwSYmF~HpN~gqE1f2U{K|(En(q^m{?Wqk5-I@57YYuC!!0bn z$-F(k{AxCvEfxzQ?cBTl#ib>O!;vo(#_4fPoDV>v(Io+|?qL*F08qr3N9ZFy)awni z##uE@8yKC9wOGxjN~OXhRK$3U9H){H$wtNAvl#7;Q=uPI6UW4^L5y{s4H7u?x~G>y zLoZAWDgZdH)mWDObaFB`Yt(9Jqh32_&>8hQtHso65te0-Yqim8oJwXq3qMz~Ot`S3 zWae7@MGS)!@)n*extd)~uE#Lom^et_=o7`8Vw=3uIOxtAnr3twokp$Gs?};WMNyp& z==BUCgrcai4*YI@gfX(ABqZsz)346V3iAGd}$wLJI zX0y3kty;_v+pTX(1ZkS4X}Z&C8x4kfy>2p@Myt_+CzDM5$?o$`N*DKpb~~@gt|>;^O?`@>0pWR;xt_VHoBBW5jV|JiJ z7wEN!0IZDKk79KAB{7Bp1vdwleq#}%2~XHNad8|Rwztx0r_;%~Tz0!10LtYuE*523 ze!9GTwZr!PgX-Vn5JK|#eChD8TrLBEjb%BG69i%U+xJ_j=~dYEncm{u0Mj7e0N(+j W2v*+-k+cK=0000=RjqHE;dpHb~4s0Jmnq)Zt ze7kGlny}S2=act-_x7=Q zSL|c2w+g)4W%g+QZr7aKWfD#qv!3PszqU7h@x>QqKPrW1FYDa3e0rX_;h(OGy>W}* zyVp!pUROlM<_=^FFhe#sVc%Z}NZrUh?T>9{USmieT_`^>bP0l+XkKEm-Ij diff --git a/tests/auto/widgets/styles/qstyle/images/vista/spinbox.png b/tests/auto/widgets/styles/qstyle/images/vista/spinbox.png deleted file mode 100644 index b8d0823ab2d0574c586dd581a498694827323efc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 583 zcmV-N0=WH&P)gf|MylPD%4ARr>fH??q);dTz~oR>Tn_?(-|shq7L6qs3THDp z0JbURY{;qJodf~_hf1$IvpG6GaW1wnQMx+q@13=}$(*&(0e2Fjh+oMq|%3WzAnvMkFpOK0>YSFmawB-Uu+cP) z5MpfCSCjM>D(6(kGm#A;gq{SM0%Pr&$mT0Xod1pfm(V%f(^K(Pz612* Va`F?~?2Z5c002ovPDHLkV1gaE3myOf diff --git a/tests/auto/widgets/styles/qstyle/qstyle.pro b/tests/auto/widgets/styles/qstyle/qstyle.pro index 9ad0940245..4dc0525c49 100644 --- a/tests/auto/widgets/styles/qstyle/qstyle.pro +++ b/tests/auto/widgets/styles/qstyle/qstyle.pro @@ -2,8 +2,3 @@ CONFIG += testcase TARGET = tst_qstyle QT += widgets testlib testlib-private SOURCES += tst_qstyle.cpp - -android:!android-embedded { - RESOURCES += \ - testdata.qrc -} diff --git a/tests/auto/widgets/styles/qstyle/testdata.qrc b/tests/auto/widgets/styles/qstyle/testdata.qrc deleted file mode 100644 index 29bb46726e..0000000000 --- a/tests/auto/widgets/styles/qstyle/testdata.qrc +++ /dev/null @@ -1,19 +0,0 @@ - - - images/mac/button.png - images/mac/combobox.png - images/mac/lineedit.png - images/mac/mdi.png - images/mac/menu.png - images/mac/radiobutton.png - images/mac/slider.png - images/mac/spinbox.png - images/vista/button.png - images/vista/combobox.png - images/vista/lineedit.png - images/vista/menu.png - images/vista/radiobutton.png - images/vista/slider.png - images/vista/spinbox.png - - diff --git a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp index 68e672e16d..ae084310b1 100644 --- a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp +++ b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp @@ -73,7 +73,6 @@ public: private: bool testAllFunctions(QStyle *); bool testScrollBarSubControls(); - void testPainting(QStyle *style, const QString &platform); private slots: void drawItemPixmap(); void init(); @@ -333,141 +332,15 @@ void tst_QStyle::testWindowsStyle() delete wstyle; } -void writeImage(const QString &fileName, QImage image) -{ - QImageWriter imageWriter(fileName); - imageWriter.setFormat("png"); - qDebug() << "result " << imageWriter.write(image); -} - -QImage readImage(const QString &fileName) -{ - QImageReader reader(fileName); - return reader.read(); -} - - #if defined(Q_OS_WIN) && !defined(QT_NO_STYLE_WINDOWSVISTA) && !defined(Q_OS_WINRT) void tst_QStyle::testWindowsVistaStyle() { QStyle *vistastyle = QStyleFactory::create("WindowsVista"); QVERIFY(testAllFunctions(vistastyle)); - - if (QOperatingSystemVersion::current().majorVersion() - == QOperatingSystemVersion::WindowsVista.majorVersion() - && QOperatingSystemVersion::current().minorVersion() - == QOperatingSystemVersion::WindowsVista.minorVersion()) - testPainting(vistastyle, "vista"); delete vistastyle; } #endif -void comparePixmap(const QString &filename, const QPixmap &pixmap) -{ - QImage oldFile = readImage(filename); - QPixmap oldPixmap = QPixmap::fromImage(oldFile); - if (!oldFile.isNull()) - QCOMPARE(pixmap, oldPixmap); - else - writeImage(filename, pixmap.toImage()); -} - -void tst_QStyle::testPainting(QStyle *style, const QString &platform) -{ -qDebug("TEST PAINTING"); - //Test Menu - QString fileName = "images/" + platform + "/menu.png"; - QMenu menu; - menu.setStyle(style); - menu.show(); - menu.addAction(new QAction("Test 1", &menu)); - menu.addAction(new QAction("Test 2", &menu)); - QPixmap pixmap = menu.grab(); - comparePixmap(fileName, pixmap); - - //Push button - fileName = "images/" + platform + "/button.png"; - QPushButton button("OK"); - button.setStyle(style); - button.show(); - pixmap = button.grab(); - button.hide(); - comparePixmap(fileName, pixmap); - - //Push button - fileName = "images/" + platform + "/radiobutton.png"; - QRadioButton radiobutton("Check"); - radiobutton.setStyle(style); - radiobutton.show(); - pixmap = radiobutton.grab(); - radiobutton.hide(); - comparePixmap(fileName, pixmap); - - //Combo box - fileName = "images/" + platform + "/combobox.png"; - QComboBox combobox; - combobox.setStyle(style); - combobox.addItem("Test 1"); - combobox.addItem("Test 2"); - combobox.show(); - pixmap = combobox.grab(); - combobox.hide(); - comparePixmap(fileName, pixmap); - - //Spin box - fileName = "images/" + platform + "/spinbox.png"; - QDoubleSpinBox spinbox; - spinbox.setLocale(QLocale(QLocale::English, QLocale::UnitedStates)); - spinbox.setStyle(style); - spinbox.show(); - pixmap = spinbox.grab(); - spinbox.hide(); - comparePixmap(fileName, pixmap); - QLocale::setDefault(QLocale::system()); - - //Slider - fileName = "images/" + platform + "/slider.png"; - QSlider slider; - slider.setStyle(style); - slider.show(); - pixmap = slider.grab(); - slider.hide(); - comparePixmap(fileName, pixmap); - - //Line edit - fileName = "images/" + platform + "/lineedit.png"; - QLineEdit lineedit("Test text"); - lineedit.setStyle(style); - lineedit.show(); - pixmap = lineedit.grab(); - lineedit.hide(); - comparePixmap(fileName, pixmap); - - //MDI - fileName = "images/" + platform + "/mdi.png"; - QMdiArea mdiArea; - mdiArea.addSubWindow(new QWidget(&mdiArea)); - mdiArea.resize(200, 200); - mdiArea.setStyle(style); - mdiArea.show(); - pixmap = mdiArea.grab(); - mdiArea.hide(); - comparePixmap(fileName, pixmap); - - // QToolButton - fileName = "images/" + platform + "/toolbutton.png"; - QToolButton tb; - tb.setToolButtonStyle(Qt::ToolButtonTextUnderIcon); - tb.setText("AaQqPpXx"); - tb.setIcon(style->standardPixmap(QStyle::SP_DirHomeIcon)); - tb.setStyle(style); - tb.show(); - pixmap = tb.grab(); - tb.hide(); - comparePixmap(fileName, pixmap); - -} - #ifdef Q_OS_MAC void tst_QStyle::testMacStyle() {