diff options
Diffstat (limited to 'tests/auto/gui')
54 files changed, 30 insertions, 4880 deletions
diff --git a/tests/auto/gui/image/image.pro b/tests/auto/gui/image/image.pro index fa8f8df29d..5a03063f47 100644 --- a/tests/auto/gui/image/image.pro +++ b/tests/auto/gui/image/image.pro @@ -5,11 +5,9 @@ SUBDIRS=\ qpixmap \ qpixmapcache \ qimage \ - qpixmapfilter \ qimageiohandler \ qimagewriter \ qmovie \ - qicon \ qpicture \ !contains(QT_CONFIG, private_tests): SUBDIRS -= \ diff --git a/tests/auto/gui/image/qicon/.gitignore b/tests/auto/gui/image/qicon/.gitignore deleted file mode 100644 index c101ef9d28..0000000000 --- a/tests/auto/gui/image/qicon/.gitignore +++ /dev/null @@ -1 +0,0 @@ -tst_qicon diff --git a/tests/auto/gui/image/qicon/icons/testtheme/16x16/actions/appointment-new.png b/tests/auto/gui/image/qicon/icons/testtheme/16x16/actions/appointment-new.png Binary files differdeleted file mode 100644 index 18b7c6781e..0000000000 --- a/tests/auto/gui/image/qicon/icons/testtheme/16x16/actions/appointment-new.png +++ /dev/null diff --git a/tests/auto/gui/image/qicon/icons/testtheme/22x22/actions/appointment-new.png b/tests/auto/gui/image/qicon/icons/testtheme/22x22/actions/appointment-new.png Binary files differdeleted file mode 100644 index d676ffd463..0000000000 --- a/tests/auto/gui/image/qicon/icons/testtheme/22x22/actions/appointment-new.png +++ /dev/null diff --git a/tests/auto/gui/image/qicon/icons/testtheme/32x32/actions/appointment-new.png b/tests/auto/gui/image/qicon/icons/testtheme/32x32/actions/appointment-new.png Binary files differdeleted file mode 100644 index 85daef3b0b..0000000000 --- a/tests/auto/gui/image/qicon/icons/testtheme/32x32/actions/appointment-new.png +++ /dev/null diff --git a/tests/auto/gui/image/qicon/icons/testtheme/index.theme b/tests/auto/gui/image/qicon/icons/testtheme/index.theme deleted file mode 100644 index e18736ab43..0000000000 --- a/tests/auto/gui/image/qicon/icons/testtheme/index.theme +++ /dev/null @@ -1,492 +0,0 @@ -[Icon Theme] -_Name=Test -_Comment=Test Theme -Inherits=crystalsvg, themeparent -Example=x-directory-normal - -# KDE Specific Stuff -DisplayDepth=32 -LinkOverlay=link_overlay -LockOverlay=lock_overlay -ZipOverlay=zip_overlay -DesktopDefault=48 -DesktopSizes=16,22,32,48,64,72,96,128 -ToolbarDefault=22 -ToolbarSizes=16,22,32,48 -MainToolbarDefault=22 -MainToolbarSizes=16,22,32,48 -SmallDefault=16 -SmallSizes=16 -PanelDefault=32 -PanelSizes=16,22,32,48,64,72,96,128 - -# Directory list -Directories=16x16/actions,16x16/apps,16x16/categories,16x16/devices,16x16/emblems,16x16/emotes,16x16/mimetypes,16x16/places,16x16/status,22x22/actions,22x22/apps,22x22/categories,22x22/devices,22x22/emblems,22x22/emotes,22x22/mimetypes,22x22/places,22x22/status,24x24/actions,24x24/apps,24x24/categories,24x24/devices,24x24/emblems,24x24/emotes,24x24/mimetypes,24x24/places,24x24/status,32x32/actions,32x32/apps,32x32/categories,32x32/devices,32x32/emblems,32x32/emotes,32x32/mimetypes,32x32/places,32x32/status,48x48/actions,48x48/apps,48x48/categories,48x48/devices,48x48/emblems,48x48/emotes,48x48/mimetypes,48x48/places,48x48/status,64x64/actions,64x64/apps,64x64/categories,64x64/devices,64x64/emblems,64x64/emotes,64x64/mimetypes,64x64/places,64x64/status,72x72/actions,72x72/apps,72x72/categories,72x72/devices,72x72/emblems,72x72/emotes,72x72/mimetypes,72x72/places,72x72/status,96x96/actions,96x96/apps,96x96/categories,96x96/devices,96x96/emblems,96x96/emotes,96x96/mimetypes,96x96/places,96x96/status,128x128/actions,128x128/apps,128x128/categories,128x128/devices,128x128/emblems,128x128/emotes,128x128/mimetypes,128x128/places,128x128/status,scalable/actions,scalable/apps,scalable/categories,scalable/devices,scalable/emblems,scalable/emotes,scalable/mimetypes,scalable/places,scalable/status - -[16x16/actions] -Size=16 -Context=Actions -Type=Fixed - -[16x16/apps] -Size=16 -Context=Applications -Type=Fixed - -[16x16/categories] -Size=16 -Context=Categories -Type=Fixed - -[16x16/devices] -Size=16 -Context=Devices -Type=Fixed - -[16x16/emblems] -Size=16 -Context=Emblems -Type=Fixed - -[16x16/emotes] -Size=16 -Context=Emotes -Type=Fixed - -[16x16/mimetypes] -Size=16 -Context=MimeTypes -Type=Fixed - -[16x16/places] -Size=16 -Context=Places -Type=Fixed - -[16x16/status] -Size=16 -Context=Status -Type=Fixed - -[22x22/actions] -Size=22 -Context=Actions -Type=Fixed - -[22x22/apps] -Size=22 -Context=Applications -Type=Fixed - -[22x22/categories] -Size=22 -Context=Categories -Type=Fixed - -[22x22/devices] -Size=22 -Context=Devices -Type=Fixed - -[22x22/emblems] -Size=22 -Context=Emblems -Type=Fixed - -[22x22/emotes] -Size=22 -Context=Emotes -Type=Fixed - -[22x22/mimetypes] -Size=22 -Context=MimeTypes -Type=Fixed - -[22x22/places] -Size=22 -Context=Places -Type=Fixed - -[22x22/status] -Size=22 -Context=Status -Type=Fixed - -[24x24/actions] -Size=24 -Context=Actions -Type=Fixed - -[24x24/apps] -Size=24 -Context=Applications -Type=Fixed - -[24x24/categories] -Size=24 -Context=Categories -Type=Fixed - -[24x24/devices] -Size=24 -Context=Devices -Type=Fixed - -[24x24/emblems] -Size=24 -Context=Emblems -Type=Fixed - -[24x24/emotes] -Size=24 -Context=Emotes -Type=Fixed - -[24x24/mimetypes] -Size=24 -Context=MimeTypes -Type=Fixed - -[24x24/places] -Size=24 -Context=Places -Type=Fixed - -[24x24/status] -Size=24 -Context=Status -Type=Fixed - -[32x32/actions] -Size=32 -Context=Actions -Type=Fixed - -[32x32/apps] -Size=32 -Context=Applications -Type=Fixed - -[32x32/categories] -Size=32 -Context=Categories -Type=Fixed - -[32x32/devices] -Size=32 -Context=Devices -Type=Fixed - -[32x32/emblems] -Size=32 -Context=Emblems -Type=Fixed - -[32x32/emotes] -Size=32 -Context=Emotes -Type=Fixed - -[32x32/mimetypes] -Size=32 -Context=MimeTypes -Type=Fixed - -[32x32/places] -Size=32 -Context=Places -Type=Fixed - -[32x32/status] -Size=32 -Context=Status -Type=Fixed - -[48x48/actions] -Size=48 -Context=Actions -Type=Fixed - -[48x48/apps] -Size=48 -Context=Applications -Type=Fixed - -[48x48/categories] -Size=48 -Context=Categories -Type=Fixed - -[48x48/devices] -Size=48 -Context=Devices -Type=Fixed - -[48x48/emblems] -Size=48 -Context=Emblems -Type=Fixed - -[48x48/emotes] -Size=48 -Context=Emotes -Type=Fixed - -[48x48/mimetypes] -Size=48 -Context=MimeTypes -Type=Fixed - -[48x48/places] -Size=48 -Context=Places -Type=Fixed - -[48x48/status] -Size=48 -Context=Status -Type=Fixed - -[64x64/actions] -Size=64 -Context=Actions -Type=Fixed - -[64x64/apps] -Size=64 -Context=Applications -Type=Fixed - -[64x64/categories] -Size=64 -Context=Categories -Type=Fixed - -[64x64/devices] -Size=64 -Context=Devices -Type=Fixed - -[64x64/emblems] -Size=64 -Context=Emblems -Type=Fixed - -[64x64/emotes] -Size=64 -Context=Emotes -Type=Fixed - -[64x64/mimetypes] -Size=64 -Context=MimeTypes -Type=Fixed - -[64x64/places] -Size=64 -Context=Places -Type=Fixed - -[64x64/status] -Size=64 -Context=Status -Type=Fixed - -[72x72/actions] -Size=72 -Context=Actions -Type=Fixed - -[72x72/apps] -Size=72 -Context=Applications -Type=Fixed - -[72x72/categories] -Size=72 -Context=Categories -Type=Fixed - -[72x72/devices] -Size=72 -Context=Devices -Type=Fixed - -[72x72/emblems] -Size=72 -Context=Emblems -Type=Fixed - -[72x72/emotes] -Size=72 -Context=Emotes -Type=Fixed - -[72x72/mimetypes] -Size=72 -Context=MimeTypes -Type=Fixed - -[72x72/places] -Size=72 -Context=Places -Type=Fixed - -[72x72/status] -Size=72 -Context=Status -Type=Fixed - -[96x96/actions] -Size=96 -Context=Actions -Type=Fixed - -[96x96/apps] -Size=96 -Context=Applications -Type=Fixed - -[96x96/categories] -Size=96 -Context=Categories -Type=Fixed - -[96x96/devices] -Size=96 -Context=Devices -Type=Fixed - -[96x96/emblems] -Size=96 -Context=Emblems -Type=Fixed - -[96x96/emotes] -Size=96 -Context=Emotes -Type=Fixed - -[96x96/mimetypes] -Size=96 -Context=MimeTypes -Type=Fixed - -[96x96/places] -Size=96 -Context=Places -Type=Fixed - -[96x96/status] -Size=96 -Context=Status -Type=Fixed - -[128x128/actions] -Size=128 -Context=Actions -Type=Fixed - -[128x128/apps] -Size=128 -Context=Applications -Type=Fixed - -[128x128/categories] -Size=128 -Context=Categories -Type=Fixed - -[128x128/devices] -Size=128 -Context=Devices -Type=Fixed - -[128x128/emblems] -Size=128 -Context=Emblems -Type=Fixed - -[128x128/emotes] -Size=128 -Context=Emotes -Type=Fixed - -[128x128/mimetypes] -Size=128 -Context=MimeTypes -Type=Fixed - -[128x128/places] -Size=128 -Context=Places -Type=Fixed - -[128x128/status] -Size=128 -Context=Status -Type=Fixed - -[scalable/actions] -Size=48 -Context=Actions -Type=Scalable -MinSize=32 -MaxSize=256 - -[scalable/apps] -Size=48 -Context=Applications -Type=Scalable -MinSize=32 -MaxSize=256 - -[scalable/categories] -Size=48 -Context=Categories -Type=Scalable -MinSize=32 -MaxSize=256 - -[scalable/devices] -Size=48 -Context=Devices -Type=Scalable -MinSize=32 -MaxSize=256 - -[scalable/emblems] -Size=48 -Context=Emblems -Type=Scalable -MinSize=32 -MaxSize=256 - -[scalable/emotes] -Size=48 -Context=Emotes -Type=Scalable -Minsize=32 -MaxSize=256 - -[scalable/mimetypes] -Size=48 -Context=MimeTypes -Type=Scalable -MinSize=32 -MaxSize=256 - -[scalable/places] -Size=48 -Context=Places -Type=Scalable -MinSize=32 -MaxSize=256 - -[scalable/status] -Size=48 -Context=Status -Type=Scalable -MinSize=32 -MaxSize=256 diff --git a/tests/auto/gui/image/qicon/icons/testtheme/scalable/actions/svg-only.svg b/tests/auto/gui/image/qicon/icons/testtheme/scalable/actions/svg-only.svg deleted file mode 100644 index 4cb14f82f0..0000000000 --- a/tests/auto/gui/image/qicon/icons/testtheme/scalable/actions/svg-only.svg +++ /dev/null @@ -1,425 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - inkscape:export-ydpi="90.000000" - inkscape:export-xdpi="90.000000" - inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png" - width="48px" - height="48px" - id="svg11300" - sodipodi:version="0.32" - inkscape:version="0.46" - sodipodi:docbase="/home/tigert/cvs/freedesktop.org/tango-icon-theme/scalable/actions" - sodipodi:docname="appointment-new.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> - <defs - id="defs3"> - <inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 24 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="48 : 24 : 1" - inkscape:persp3d-origin="24 : 16 : 1" - id="perspective59" /> - <linearGradient - inkscape:collect="always" - id="linearGradient5204"> - <stop - style="stop-color:#c4a000;stop-opacity:1;" - offset="0" - id="stop5206" /> - <stop - style="stop-color:#c4a000;stop-opacity:0;" - offset="1" - id="stop5208" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient5196"> - <stop - style="stop-color:#c4a000;stop-opacity:1;" - offset="0" - id="stop5198" /> - <stop - style="stop-color:#c4a000;stop-opacity:0;" - offset="1" - id="stop5200" /> - </linearGradient> - <linearGradient - id="linearGradient12512"> - <stop - style="stop-color:#ffffff;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop12513" /> - <stop - style="stop-color:#fff520;stop-opacity:0.89108908;" - offset="0.50000000" - id="stop12517" /> - <stop - style="stop-color:#fff300;stop-opacity:0.0000000;" - offset="1.0000000" - id="stop12514" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient12512" - id="radialGradient278" - gradientUnits="userSpaceOnUse" - cx="55.000000" - cy="125.00000" - fx="55.000000" - fy="125.00000" - r="14.375000" /> - <linearGradient - id="linearGradient10653"> - <stop - style="stop-color:#f3f4ff;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop10655" /> - <stop - style="stop-color:#9193af;stop-opacity:1.0000000;" - offset="1.0000000" - id="stop10657" /> - </linearGradient> - <linearGradient - id="linearGradient42174"> - <stop - style="stop-color:#a0a0a0;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop42176" /> - <stop - style="stop-color:#ffffff;stop-opacity:1.0000000;" - offset="1.0000000" - id="stop42178" /> - </linearGradient> - <linearGradient - id="linearGradient2145"> - <stop - style="stop-color:#fffffd;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop2147" /> - <stop - style="stop-color:#cbcbc9;stop-opacity:1.0000000;" - offset="1.0000000" - id="stop2149" /> - </linearGradient> - <linearGradient - id="linearGradient37935"> - <stop - id="stop37937" - offset="0.0000000" - style="stop-color:#9497b3;stop-opacity:1.0000000;" /> - <stop - id="stop37939" - offset="1.0000000" - style="stop-color:#4c4059;stop-opacity:1.0000000;" /> - </linearGradient> - <linearGradient - id="linearGradient2152"> - <stop - id="stop2154" - offset="0.0000000" - style="stop-color:#9aa29a;stop-opacity:1.0000000;" /> - <stop - id="stop2156" - offset="1.0000000" - style="stop-color:#b5beb5;stop-opacity:1.0000000;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient3816"> - <stop - style="stop-color:#000000;stop-opacity:1;" - offset="0" - id="stop3818" /> - <stop - style="stop-color:#000000;stop-opacity:0;" - offset="1" - id="stop3820" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3816" - id="radialGradient3822" - cx="31.112698" - cy="19.008621" - fx="31.112698" - fy="19.008621" - r="8.6620579" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2152" - id="linearGradient4307" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.123841,0.000000,0.000000,0.969691,-31.88758,-19.59492)" - x1="8.9156475" - y1="37.197018" - x2="9.8855033" - y2="52.090678" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient10653" - id="radialGradient4309" - gradientUnits="userSpaceOnUse" - cx="11.329200" - cy="10.583970" - fx="11.329200" - fy="10.583970" - r="15.532059" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient2145" - id="radialGradient4311" - gradientUnits="userSpaceOnUse" - cx="11.901996" - cy="10.045444" - fx="11.901996" - fy="10.045444" - r="29.292715" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient42174" - id="linearGradient4313" - gradientUnits="userSpaceOnUse" - x1="6.3422160" - y1="7.7893324" - x2="22.218424" - y2="25.884274" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient5196" - id="radialGradient5202" - cx="23.375" - cy="10.972863" - fx="23.375" - fy="10.972863" - r="3.3478092" - gradientTransform="matrix(3.630420,1.654030e-15,-1.608743e-15,3.742066,-61.48607,-29.18618)" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5204" - id="linearGradient5210" - x1="19.667364" - y1="4.2570662" - x2="20.329933" - y2="5.2845874" - gradientUnits="userSpaceOnUse" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient37935" - id="radialGradient5212" - gradientUnits="userSpaceOnUse" - cx="8.7468252" - cy="6.8283234" - fx="8.7468252" - fy="6.8283234" - r="29.889715" /> - </defs> - <sodipodi:namedview - stroke="#c4a000" - fill="#babdb6" - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="0.25490196" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="11.313708" - inkscape:cx="13.2248" - inkscape:cy="25.106052" - inkscape:current-layer="layer1" - showgrid="false" - inkscape:grid-bbox="true" - inkscape:document-units="px" - inkscape:showpageshadow="false" - inkscape:window-width="833" - inkscape:window-height="772" - inkscape:window-x="305" - inkscape:window-y="76" /> - <metadata - id="metadata4"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:creator> - <cc:Agent> - <dc:title>Jakub Steiner</dc:title> - </cc:Agent> - </dc:creator> - <dc:source>http://jimmac.musichall.cz</dc:source> - <cc:license - rdf:resource="http://creativecommons.org/licenses/publicdomain/" /> - <dc:title>New Appointment</dc:title> - <dc:subject> - <rdf:Bag> - <rdf:li>appointment</rdf:li> - <rdf:li>new</rdf:li> - <rdf:li>meeting</rdf:li> - <rdf:li>rvsp</rdf:li> - </rdf:Bag> - </dc:subject> - </cc:Work> - <cc:License - rdf:about="http://creativecommons.org/licenses/publicdomain/"> - <cc:permits - rdf:resource="http://creativecommons.org/ns#Reproduction" /> - <cc:permits - rdf:resource="http://creativecommons.org/ns#Distribution" /> - <cc:permits - rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> - </cc:License> - </rdf:RDF> - </metadata> - <g - id="layer1" - inkscape:label="Layer 1" - inkscape:groupmode="layer"> - <path - d="M 39.774755 19.008621 A 8.6620579 8.6620579 0 1 1 22.45064,19.008621 A 8.6620579 8.6620579 0 1 1 39.774755 19.008621 z" - sodipodi:ry="8.6620579" - sodipodi:rx="8.6620579" - sodipodi:cy="19.008621" - sodipodi:cx="31.112698" - id="path4318" - style="opacity:1;color:#000000;fill:url(#radialGradient3822);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" - sodipodi:type="arc" - transform="matrix(2.563158,0.000000,0.000000,1.219602,-55.98414,14.04144)" /> - <path - sodipodi:nodetypes="cccc" - id="path14341" - d="M 18.587591,1.403729 L 4.226755,18.096665 L 5.4854717,19.339844 L 18.587591,1.403729 z " - style="color:#000000;fill:url(#linearGradient4307);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> - <path - sodipodi:nodetypes="cccc" - id="path18921" - d="M 18.467176,1.3138035 L 5.6605716,19.072612 L 7.4900985,20.687913 L 18.467176,1.3138035 z " - style="fill:#fefefe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" /> - <path - transform="matrix(1.431529,0.000000,0.000000,1.431529,0.569459,-1.654618)" - d="M 31.160714 16.910715 A 14.910714 14.910714 0 1 1 1.3392859,16.910715 A 14.910714 14.910714 0 1 1 31.160714 16.910715 z" - sodipodi:ry="14.910714" - sodipodi:rx="14.910714" - sodipodi:cy="16.910715" - sodipodi:cx="16.25" - id="path27786" - style="fill:url(#radialGradient5212);fill-opacity:1;fill-rule:evenodd;stroke:#605773;stroke-width:0.69855404;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" - sodipodi:type="arc" /> - <path - transform="matrix(1.163838,0.000000,0.000000,1.163838,4.824801,2.777556)" - d="M 31.160714 16.910715 A 14.910714 14.910714 0 1 1 1.3392859,16.910715 A 14.910714 14.910714 0 1 1 31.160714 16.910715 z" - sodipodi:ry="14.910714" - sodipodi:rx="14.910714" - sodipodi:cy="16.910715" - sodipodi:cx="16.25" - id="path35549" - style="fill:url(#radialGradient4311);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4313);stroke-width:0.71139598;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" - sodipodi:type="arc" /> - <path - sodipodi:type="arc" - style="opacity:1;color:#000000;fill:url(#radialGradient5202);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5210);stroke-width:0.56498736;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" - id="path4120" - sodipodi:cx="23.375" - sodipodi:cy="11.875" - sodipodi:rx="8.5" - sodipodi:ry="8.5" - d="M 16.679382,6.6387137 A 8.5,8.5 0 0 1 23.332691,3.3751053 L 23.375,11.875 z" - transform="matrix(1.769951,0.000000,0.000000,1.769951,-17.02424,1.610741)" - sodipodi:start="3.8052902" - sodipodi:end="4.7074114" /> - <path - transform="matrix(2.073295,0.000000,0.000000,2.073295,-7.310224,-13.13682)" - d="M 16.40625 17.28125 A 1.21875 1.21875 0 1 1 13.96875,17.28125 A 1.21875 1.21875 0 1 1 16.40625 17.28125 z" - sodipodi:ry="1.21875" - sodipodi:rx="1.21875" - sodipodi:cy="17.28125" - sodipodi:cx="15.1875" - id="path34778" - style="fill:#f3f3f3;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.48232403;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;stroke-dasharray:none" - sodipodi:type="arc" /> - <path - id="path35559" - d="M 22.176614,20.718014 L 13.155702,13.140282" - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> - <path - id="path35561" - d="M 19.408614,29.776506 L 22.368655,25.283228" - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - sodipodi:nodetypes="cc" /> - <path - transform="matrix(2.749493,0.000000,0.000000,2.749493,-22.30073,-12.40939)" - d="M 17.324117 7.6932044 A 0.61871845 0.61871845 0 1 1 16.08668,7.6932044 A 0.61871845 0.61871845 0 1 1 17.324117 7.6932044 z" - sodipodi:ry="0.61871845" - sodipodi:rx="0.61871845" - sodipodi:cy="7.6932044" - sodipodi:cx="16.705399" - id="path35563" - style="fill:#b6b9b1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.36871839;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;opacity:1" - sodipodi:type="arc" /> - <path - transform="matrix(2.749493,0.000000,0.000000,2.749493,-22.30073,14.80922)" - d="M 17.324117 7.6932044 A 0.61871845 0.61871845 0 1 1 16.08668,7.6932044 A 0.61871845 0.61871845 0 1 1 17.324117 7.6932044 z" - sodipodi:ry="0.61871845" - sodipodi:rx="0.61871845" - sodipodi:cy="7.6932044" - sodipodi:cx="16.705399" - id="path35565" - style="fill:#b6b9b1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.36871839;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;opacity:1" - sodipodi:type="arc" /> - <path - transform="matrix(2.749493,0.000000,0.000000,2.749493,-35.91004,1.199890)" - d="M 17.324117 7.6932044 A 0.61871845 0.61871845 0 1 1 16.08668,7.6932044 A 0.61871845 0.61871845 0 1 1 17.324117 7.6932044 z" - sodipodi:ry="0.61871845" - sodipodi:rx="0.61871845" - sodipodi:cy="7.6932044" - sodipodi:cx="16.705399" - id="path35567" - style="fill:#b6b9b1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.36871839;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;opacity:1" - sodipodi:type="arc" /> - <path - transform="matrix(2.749493,0.000000,0.000000,2.749493,-8.691448,1.199890)" - d="M 17.324117 7.6932044 A 0.61871845 0.61871845 0 1 1 16.08668,7.6932044 A 0.61871845 0.61871845 0 1 1 17.324117 7.6932044 z" - sodipodi:ry="0.61871845" - sodipodi:rx="0.61871845" - sodipodi:cy="7.6932044" - sodipodi:cx="16.705399" - id="path35569" - style="fill:#b6b9b1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.36871839;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;opacity:1" - sodipodi:type="arc" /> - <path - sodipodi:type="arc" - style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#radialGradient4309);stroke-width:0.73656511;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" - id="path10651" - sodipodi:cx="16.25" - sodipodi:cy="16.910715" - sodipodi:rx="14.910714" - sodipodi:ry="14.910714" - d="M 31.160714 16.910715 A 14.910714 14.910714 0 1 1 1.3392859,16.910715 A 14.910714 14.910714 0 1 1 31.160714 16.910715 z" - transform="matrix(1.357654,0.000000,0.000000,1.357654,1.769896,-0.493735)" /> - <path - sodipodi:type="arc" - style="color:#000000;fill:url(#radialGradient278);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.25000024;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - id="path12511" - sodipodi:cx="55" - sodipodi:cy="125" - sodipodi:rx="14.375" - sodipodi:ry="14.375" - d="M 69.375 125 A 14.375 14.375 0 1 1 40.625,125 A 14.375 14.375 0 1 1 69.375 125 z" - transform="matrix(0.611127,0.000000,0.000000,0.611127,5.544052,-66.92818)" - inkscape:export-filename="/home/jimmac/ximian_art/icons/nautilus/suse93/stock_new-16.png" - inkscape:export-xdpi="33.852203" - inkscape:export-ydpi="33.852203" /> - </g> -</svg> diff --git a/tests/auto/gui/image/qicon/icons/themeparent/16x16/actions/address-book-new.png b/tests/auto/gui/image/qicon/icons/themeparent/16x16/actions/address-book-new.png Binary files differdeleted file mode 100644 index 2098cfdf36..0000000000 --- a/tests/auto/gui/image/qicon/icons/themeparent/16x16/actions/address-book-new.png +++ /dev/null diff --git a/tests/auto/gui/image/qicon/icons/themeparent/16x16/actions/appointment-new.png b/tests/auto/gui/image/qicon/icons/themeparent/16x16/actions/appointment-new.png Binary files differdeleted file mode 100644 index 18b7c6781e..0000000000 --- a/tests/auto/gui/image/qicon/icons/themeparent/16x16/actions/appointment-new.png +++ /dev/null diff --git a/tests/auto/gui/image/qicon/icons/themeparent/22x22/actions/address-book-new.png b/tests/auto/gui/image/qicon/icons/themeparent/22x22/actions/address-book-new.png Binary files differdeleted file mode 100644 index fad446cd92..0000000000 --- a/tests/auto/gui/image/qicon/icons/themeparent/22x22/actions/address-book-new.png +++ /dev/null diff --git a/tests/auto/gui/image/qicon/icons/themeparent/22x22/actions/appointment-new.png b/tests/auto/gui/image/qicon/icons/themeparent/22x22/actions/appointment-new.png Binary files differdeleted file mode 100644 index d676ffd463..0000000000 --- a/tests/auto/gui/image/qicon/icons/themeparent/22x22/actions/appointment-new.png +++ /dev/null diff --git a/tests/auto/gui/image/qicon/icons/themeparent/32x32/actions/address-book-new.png b/tests/auto/gui/image/qicon/icons/themeparent/32x32/actions/address-book-new.png Binary files differdeleted file mode 100644 index 420139d307..0000000000 --- a/tests/auto/gui/image/qicon/icons/themeparent/32x32/actions/address-book-new.png +++ /dev/null diff --git a/tests/auto/gui/image/qicon/icons/themeparent/32x32/actions/appointment-new.png b/tests/auto/gui/image/qicon/icons/themeparent/32x32/actions/appointment-new.png Binary files differdeleted file mode 100644 index 85daef3b0b..0000000000 --- a/tests/auto/gui/image/qicon/icons/themeparent/32x32/actions/appointment-new.png +++ /dev/null diff --git a/tests/auto/gui/image/qicon/icons/themeparent/index.theme b/tests/auto/gui/image/qicon/icons/themeparent/index.theme deleted file mode 100644 index e536a0bf2f..0000000000 --- a/tests/auto/gui/image/qicon/icons/themeparent/index.theme +++ /dev/null @@ -1,492 +0,0 @@ -[Icon Theme] -_Name=Test -_Comment=Test Theme -Inherits=gnome,crystalsvg -Example=x-directory-normal - -# KDE Specific Stuff -DisplayDepth=32 -LinkOverlay=link_overlay -LockOverlay=lock_overlay -ZipOverlay=zip_overlay -DesktopDefault=48 -DesktopSizes=16,22,32,48,64,72,96,128 -ToolbarDefault=22 -ToolbarSizes=16,22,32,48 -MainToolbarDefault=22 -MainToolbarSizes=16,22,32,48 -SmallDefault=16 -SmallSizes=16 -PanelDefault=32 -PanelSizes=16,22,32,48,64,72,96,128 - -# Directory list -Directories=16x16/actions,16x16/apps,16x16/categories,16x16/devices,16x16/emblems,16x16/emotes,16x16/mimetypes,16x16/places,16x16/status,22x22/actions,22x22/apps,22x22/categories,22x22/devices,22x22/emblems,22x22/emotes,22x22/mimetypes,22x22/places,22x22/status,24x24/actions,24x24/apps,24x24/categories,24x24/devices,24x24/emblems,24x24/emotes,24x24/mimetypes,24x24/places,24x24/status,32x32/actions,32x32/apps,32x32/categories,32x32/devices,32x32/emblems,32x32/emotes,32x32/mimetypes,32x32/places,32x32/status,48x48/actions,48x48/apps,48x48/categories,48x48/devices,48x48/emblems,48x48/emotes,48x48/mimetypes,48x48/places,48x48/status,64x64/actions,64x64/apps,64x64/categories,64x64/devices,64x64/emblems,64x64/emotes,64x64/mimetypes,64x64/places,64x64/status,72x72/actions,72x72/apps,72x72/categories,72x72/devices,72x72/emblems,72x72/emotes,72x72/mimetypes,72x72/places,72x72/status,96x96/actions,96x96/apps,96x96/categories,96x96/devices,96x96/emblems,96x96/emotes,96x96/mimetypes,96x96/places,96x96/status,128x128/actions,128x128/apps,128x128/categories,128x128/devices,128x128/emblems,128x128/emotes,128x128/mimetypes,128x128/places,128x128/status,scalable/actions,scalable/apps,scalable/categories,scalable/devices,scalable/emblems,scalable/emotes,scalable/mimetypes,scalable/places,scalable/status - -[16x16/actions] -Size=16 -Context=Actions -Type=Fixed - -[16x16/apps] -Size=16 -Context=Applications -Type=Fixed - -[16x16/categories] -Size=16 -Context=Categories -Type=Fixed - -[16x16/devices] -Size=16 -Context=Devices -Type=Fixed - -[16x16/emblems] -Size=16 -Context=Emblems -Type=Fixed - -[16x16/emotes] -Size=16 -Context=Emotes -Type=Fixed - -[16x16/mimetypes] -Size=16 -Context=MimeTypes -Type=Fixed - -[16x16/places] -Size=16 -Context=Places -Type=Fixed - -[16x16/status] -Size=16 -Context=Status -Type=Fixed - -[22x22/actions] -Size=22 -Context=Actions -Type=Fixed - -[22x22/apps] -Size=22 -Context=Applications -Type=Fixed - -[22x22/categories] -Size=22 -Context=Categories -Type=Fixed - -[22x22/devices] -Size=22 -Context=Devices -Type=Fixed - -[22x22/emblems] -Size=22 -Context=Emblems -Type=Fixed - -[22x22/emotes] -Size=22 -Context=Emotes -Type=Fixed - -[22x22/mimetypes] -Size=22 -Context=MimeTypes -Type=Fixed - -[22x22/places] -Size=22 -Context=Places -Type=Fixed - -[22x22/status] -Size=22 -Context=Status -Type=Fixed - -[24x24/actions] -Size=24 -Context=Actions -Type=Fixed - -[24x24/apps] -Size=24 -Context=Applications -Type=Fixed - -[24x24/categories] -Size=24 -Context=Categories -Type=Fixed - -[24x24/devices] -Size=24 -Context=Devices -Type=Fixed - -[24x24/emblems] -Size=24 -Context=Emblems -Type=Fixed - -[24x24/emotes] -Size=24 -Context=Emotes -Type=Fixed - -[24x24/mimetypes] -Size=24 -Context=MimeTypes -Type=Fixed - -[24x24/places] -Size=24 -Context=Places -Type=Fixed - -[24x24/status] -Size=24 -Context=Status -Type=Fixed - -[32x32/actions] -Size=32 -Context=Actions -Type=Fixed - -[32x32/apps] -Size=32 -Context=Applications -Type=Fixed - -[32x32/categories] -Size=32 -Context=Categories -Type=Fixed - -[32x32/devices] -Size=32 -Context=Devices -Type=Fixed - -[32x32/emblems] -Size=32 -Context=Emblems -Type=Fixed - -[32x32/emotes] -Size=32 -Context=Emotes -Type=Fixed - -[32x32/mimetypes] -Size=32 -Context=MimeTypes -Type=Fixed - -[32x32/places] -Size=32 -Context=Places -Type=Fixed - -[32x32/status] -Size=32 -Context=Status -Type=Fixed - -[48x48/actions] -Size=48 -Context=Actions -Type=Fixed - -[48x48/apps] -Size=48 -Context=Applications -Type=Fixed - -[48x48/categories] -Size=48 -Context=Categories -Type=Fixed - -[48x48/devices] -Size=48 -Context=Devices -Type=Fixed - -[48x48/emblems] -Size=48 -Context=Emblems -Type=Fixed - -[48x48/emotes] -Size=48 -Context=Emotes -Type=Fixed - -[48x48/mimetypes] -Size=48 -Context=MimeTypes -Type=Fixed - -[48x48/places] -Size=48 -Context=Places -Type=Fixed - -[48x48/status] -Size=48 -Context=Status -Type=Fixed - -[64x64/actions] -Size=64 -Context=Actions -Type=Fixed - -[64x64/apps] -Size=64 -Context=Applications -Type=Fixed - -[64x64/categories] -Size=64 -Context=Categories -Type=Fixed - -[64x64/devices] -Size=64 -Context=Devices -Type=Fixed - -[64x64/emblems] -Size=64 -Context=Emblems -Type=Fixed - -[64x64/emotes] -Size=64 -Context=Emotes -Type=Fixed - -[64x64/mimetypes] -Size=64 -Context=MimeTypes -Type=Fixed - -[64x64/places] -Size=64 -Context=Places -Type=Fixed - -[64x64/status] -Size=64 -Context=Status -Type=Fixed - -[72x72/actions] -Size=72 -Context=Actions -Type=Fixed - -[72x72/apps] -Size=72 -Context=Applications -Type=Fixed - -[72x72/categories] -Size=72 -Context=Categories -Type=Fixed - -[72x72/devices] -Size=72 -Context=Devices -Type=Fixed - -[72x72/emblems] -Size=72 -Context=Emblems -Type=Fixed - -[72x72/emotes] -Size=72 -Context=Emotes -Type=Fixed - -[72x72/mimetypes] -Size=72 -Context=MimeTypes -Type=Fixed - -[72x72/places] -Size=72 -Context=Places -Type=Fixed - -[72x72/status] -Size=72 -Context=Status -Type=Fixed - -[96x96/actions] -Size=96 -Context=Actions -Type=Fixed - -[96x96/apps] -Size=96 -Context=Applications -Type=Fixed - -[96x96/categories] -Size=96 -Context=Categories -Type=Fixed - -[96x96/devices] -Size=96 -Context=Devices -Type=Fixed - -[96x96/emblems] -Size=96 -Context=Emblems -Type=Fixed - -[96x96/emotes] -Size=96 -Context=Emotes -Type=Fixed - -[96x96/mimetypes] -Size=96 -Context=MimeTypes -Type=Fixed - -[96x96/places] -Size=96 -Context=Places -Type=Fixed - -[96x96/status] -Size=96 -Context=Status -Type=Fixed - -[128x128/actions] -Size=128 -Context=Actions -Type=Fixed - -[128x128/apps] -Size=128 -Context=Applications -Type=Fixed - -[128x128/categories] -Size=128 -Context=Categories -Type=Fixed - -[128x128/devices] -Size=128 -Context=Devices -Type=Fixed - -[128x128/emblems] -Size=128 -Context=Emblems -Type=Fixed - -[128x128/emotes] -Size=128 -Context=Emotes -Type=Fixed - -[128x128/mimetypes] -Size=128 -Context=MimeTypes -Type=Fixed - -[128x128/places] -Size=128 -Context=Places -Type=Fixed - -[128x128/status] -Size=128 -Context=Status -Type=Fixed - -[scalable/actions] -Size=48 -Context=Actions -Type=Scalable -MinSize=32 -MaxSize=256 - -[scalable/apps] -Size=48 -Context=Applications -Type=Scalable -MinSize=32 -MaxSize=256 - -[scalable/categories] -Size=48 -Context=Categories -Type=Scalable -MinSize=32 -MaxSize=256 - -[scalable/devices] -Size=48 -Context=Devices -Type=Scalable -MinSize=32 -MaxSize=256 - -[scalable/emblems] -Size=48 -Context=Emblems -Type=Scalable -MinSize=32 -MaxSize=256 - -[scalable/emotes] -Size=48 -Context=Emotes -Type=Scalable -Minsize=32 -MaxSize=256 - -[scalable/mimetypes] -Size=48 -Context=MimeTypes -Type=Scalable -MinSize=32 -MaxSize=256 - -[scalable/places] -Size=48 -Context=Places -Type=Scalable -MinSize=32 -MaxSize=256 - -[scalable/status] -Size=48 -Context=Status -Type=Scalable -MinSize=32 -MaxSize=256 diff --git a/tests/auto/gui/image/qicon/icons/themeparent/scalable/actions/address-book-new.svg b/tests/auto/gui/image/qicon/icons/themeparent/scalable/actions/address-book-new.svg deleted file mode 100644 index 600a82c1b0..0000000000 --- a/tests/auto/gui/image/qicon/icons/themeparent/scalable/actions/address-book-new.svg +++ /dev/null @@ -1,389 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="48px" - height="48px" - id="svg1256" - sodipodi:version="0.32" - inkscape:version="0.46" - sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions" - sodipodi:docname="address-book-new.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> - <defs - id="defs3"> - <inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 24 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="48 : 24 : 1" - inkscape:persp3d-origin="24 : 16 : 1" - id="perspective58" /> - <linearGradient - inkscape:collect="always" - id="linearGradient5060"> - <stop - style="stop-color:black;stop-opacity:1;" - offset="0" - id="stop5062" /> - <stop - style="stop-color:black;stop-opacity:0;" - offset="1" - id="stop5064" /> - </linearGradient> - <linearGradient - id="linearGradient5048"> - <stop - style="stop-color:black;stop-opacity:0;" - offset="0" - id="stop5050" /> - <stop - id="stop5056" - offset="0.5" - style="stop-color:black;stop-opacity:1;" /> - <stop - style="stop-color:black;stop-opacity:0;" - offset="1" - id="stop5052" /> - </linearGradient> - <linearGradient - id="linearGradient12512"> - <stop - style="stop-color:#ffffff;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop12513" /> - <stop - style="stop-color:#fff520;stop-opacity:0.89108908;" - offset="0.50000000" - id="stop12517" /> - <stop - style="stop-color:#fff300;stop-opacity:0.0000000;" - offset="1.0000000" - id="stop12514" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient12512" - id="radialGradient278" - gradientUnits="userSpaceOnUse" - cx="55.000000" - cy="125.00000" - fx="55.000000" - fy="125.00000" - r="14.375000" /> - <linearGradient - inkscape:collect="always" - id="linearGradient2116"> - <stop - style="stop-color:#ffffff;stop-opacity:1;" - offset="0" - id="stop2118" /> - <stop - style="stop-color:#ffffff;stop-opacity:0;" - offset="1" - id="stop2120" /> - </linearGradient> - <linearGradient - id="linearGradient2094"> - <stop - style="stop-color:#d6e3f0;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop2096" /> - <stop - style="stop-color:#95b1cf;stop-opacity:1.0000000;" - offset="1.0000000" - id="stop2098" /> - </linearGradient> - <linearGradient - id="linearGradient2803"> - <stop - id="stop2805" - offset="0" - style="stop-color:#ffffff;stop-opacity:1;" /> - <stop - id="stop2807" - offset="1.0000000" - style="stop-color:#cbcbcb;stop-opacity:1.0000000;" /> - </linearGradient> - <linearGradient - id="linearGradient2795"> - <stop - id="stop2797" - offset="0.0000000" - style="stop-color:#000000;stop-opacity:0.068627454;" /> - <stop - id="stop2799" - offset="1.0000000" - style="stop-color:#ffffff;stop-opacity:1.0000000;" /> - </linearGradient> - <linearGradient - gradientUnits="userSpaceOnUse" - y2="4.9530048" - x2="41.219128" - y1="4.9530050" - x1="35.433035" - gradientTransform="matrix(0.254000,0.000000,1.822151e-16,3.759813,0.788629,0.148567)" - id="linearGradient2801" - xlink:href="#linearGradient2795" - inkscape:collect="always" /> - <linearGradient - gradientUnits="userSpaceOnUse" - y2="84.287079" - x2="10.219901" - y1="93.338043" - x1="10.496115" - gradientTransform="matrix(2.262742,0.000000,0.000000,0.441942,1.000000,-0.875000)" - id="linearGradient2813" - xlink:href="#linearGradient2803" - inkscape:collect="always" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2094" - id="linearGradient2100" - gradientTransform="matrix(0.957750,0.000000,0.000000,1.027989,1.000000,-0.571911)" - x1="6.5871811" - y1="22.132999" - x2="14.511404" - y2="22.132999" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2116" - id="linearGradient2112" - gradientTransform="matrix(1.025428,0.000000,0.000000,0.957303,0.000000,-0.806758)" - x1="73.361984" - y1="26.652197" - x2="-2.7582901" - y2="21.270376" - gradientUnits="userSpaceOnUse" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient5060" - id="radialGradient5013" - gradientUnits="userSpaceOnUse" - cx="605.71429" - cy="486.64789" - fx="605.71429" - fy="486.64789" - r="117.14286" - gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5048" - id="linearGradient5016" - gradientUnits="userSpaceOnUse" - x1="302.85715" - y1="366.64789" - x2="302.85715" - y2="609.50507" - gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient5060" - id="radialGradient5020" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)" - cx="605.71429" - cy="486.64789" - fx="605.71429" - fy="486.64789" - r="117.14286" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5048" - id="linearGradient5027" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)" - x1="302.85715" - y1="366.64789" - x2="302.85715" - y2="609.50507" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient5060" - id="radialGradient5029" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)" - cx="605.71429" - cy="486.64789" - fx="605.71429" - fy="486.64789" - r="117.14286" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient5060" - id="radialGradient5031" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)" - cx="605.71429" - cy="486.64789" - fx="605.71429" - fy="486.64789" - r="117.14286" /> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="0.27843137" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="1" - inkscape:cx="-111.52422" - inkscape:cy="10.167608" - inkscape:current-layer="layer1" - showgrid="false" - inkscape:grid-bbox="true" - inkscape:document-units="px" - inkscape:window-width="872" - inkscape:window-height="688" - inkscape:window-x="562" - inkscape:window-y="160" - fill="#ef2929" - stroke="#cc0000" - inkscape:showpageshadow="false" /> - <metadata - id="metadata4"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title>Addess Book - New</dc:title> - <dc:date /> - <dc:creator> - <cc:Agent> - <dc:title>Jakub Steiner</dc:title> - </cc:Agent> - </dc:creator> - <dc:source>http://jimmac.musichall.cz</dc:source> - <dc:subject> - <rdf:Bag> - <rdf:li>address</rdf:li> - <rdf:li>contact</rdf:li> - <rdf:li>book</rdf:li> - </rdf:Bag> - </dc:subject> - <cc:license - rdf:resource="http://creativecommons.org/licenses/publicdomain/" /> - </cc:Work> - <cc:License - rdf:about="http://creativecommons.org/licenses/publicdomain/"> - <cc:permits - rdf:resource="http://creativecommons.org/ns#Reproduction" /> - <cc:permits - rdf:resource="http://creativecommons.org/ns#Distribution" /> - <cc:permits - rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> - </cc:License> - </rdf:RDF> - </metadata> - <g - id="layer1" - inkscape:label="Layer 1" - inkscape:groupmode="layer"> - <path - style="opacity:1;color:#000000;fill:#edd400;fill-opacity:1;fill-rule:evenodd;stroke:#c4a000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" - d="M 33.096456,4.6520202 L 40.521077,4.6520202 C 41.228184,4.6520202 41.758513,4.8287969 41.93529,5.71268 L 42.819174,12.606972 C 42.907562,13.667632 42.443523,14.021185 41.493349,14.021185 L 32.919679,14.021185 L 33.096456,4.6520202 z " - id="path21630" - sodipodi:nodetypes="ccccccc" /> - <path - sodipodi:nodetypes="ccccccc" - id="path21632" - d="M 34.10295,5.638875 L 40.463507,5.638875 C 40.771656,5.638875 40.940266,5.669037 40.986054,5.960473 L 41.777489,12.344449 C 41.847258,12.775421 41.959897,13.019804 41.637211,13.034341 L 33.963412,13.034341 L 34.10295,5.638875 z " - style="opacity:0.48538011;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000006;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> - <path - sodipodi:nodetypes="ccccccc" - id="path21634" - d="M 35.596456,12.40202 L 43.021077,12.40202 C 43.728184,12.40202 44.258513,12.578797 44.43529,13.46268 L 45.319174,20.356972 C 45.407562,21.417632 44.943523,21.771185 43.993349,21.771185 L 35.419679,21.771185 L 35.596456,12.40202 z " - style="opacity:1;color:#000000;fill:#9db029;fill-opacity:1;fill-rule:evenodd;stroke:#727e0a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> - <path - style="opacity:0.48538011;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000006;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" - d="M 36.60295,13.388875 L 42.963507,13.388875 C 43.271656,13.388875 43.440266,13.419037 43.486054,13.710473 L 44.277489,20.094449 C 44.347258,20.525421 44.459897,20.769804 44.137211,20.784341 L 36.463412,20.784341 L 36.60295,13.388875 z " - id="path21636" - sodipodi:nodetypes="ccccccc" /> - <path - style="opacity:1;color:#000000;fill:#ef2929;fill-opacity:1;fill-rule:evenodd;stroke:#cc0000;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" - d="M 36.06451,20.776498 L 44.50992,20.776498 C 45.314245,20.776498 45.917487,20.995896 46.118569,22.092882 L 47.123975,30.649381 C 47.224515,31.965765 46.696677,32.40456 45.615866,32.40456 L 35.863428,32.40456 L 36.06451,20.776498 z " - id="path21638" - sodipodi:nodetypes="ccccccc" /> - <path - sodipodi:nodetypes="ccccccc" - id="path21640" - d="M 37.209384,21.763574 L 44.444435,21.763574 C 44.79495,21.763574 44.986742,21.801928 45.038825,22.172513 L 45.939072,30.290267 C 46.018433,30.838284 46.146559,31.149038 45.779508,31.167522 L 37.050661,31.167522 L 37.209384,21.763574 z " - style="opacity:0.48538011;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000072;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> - <g - id="g5022" - transform="matrix(2.165152e-2,0,0,4.307902e-2,43.08625,34.04509)"> - <rect - y="-150.69685" - x="-1559.2523" - height="478.35718" - width="1339.6335" - id="rect4173" - style="opacity:0.40206185;color:black;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> - <path - sodipodi:nodetypes="cccc" - id="path5058" - d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z " - style="opacity:0.40206185;color:black;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> - <path - style="opacity:0.40206185;color:black;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" - d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z " - id="path5018" - sodipodi:nodetypes="cccc" /> - </g> - <path - style="color:#000000;fill:#5b6b94;fill-opacity:1;fill-rule:nonzero;stroke:#364878;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" - d="M 6.3643222,5.5185897 C 6.4551049,3.6036003 7.3719758,2.5542814 9.0788784,2.549044 L 38.405776,2.4590577 C 38.652361,2.4583011 38.974317,2.6592071 38.999012,2.9089888 L 42.257491,35.867228 L 40.942189,35.923862 L 41.571429,42.369516 C 41.632441,42.994499 41.390059,43.52882 40.5,43.533035 L 9.7893046,43.678474 C 7.25676,43.690468 4.6538454,41.59976 4.7759337,39.024403 L 6.3643222,5.5185897 z " - id="rect1408" - sodipodi:nodetypes="csssccsssss" /> - <path - id="path2489" - d="M 40.125,34.875 L 10.9375,35 C 9.3809819,35.177868 8.125,36.39612 8.125,38 C 8.125,39.60388 9.3809819,40.822132 10.9375,41 L 40.125,41.125 L 40.125,41.0625 C 38.469378,40.984348 37.125,39.674851 37.125,38 C 37.125,36.325149 38.469378,35.015652 40.125,34.9375 L 40.125,34.875 z " - style="color:#000000;fill:url(#linearGradient2813);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> - <path - sodipodi:nodetypes="ccccccssc" - id="path2784" - d="M 9.6875,2.8125 C 7.9805897,2.8125 7.050103,3.8215062 6.96875,5.6738658 L 5.3125,37.825772 C 5.22054,40.904199 7.1393732,42.654485 9.125,43.15625 C 4.875,41.525579 5.4375,34.164455 10.75,34.195222 L 41.648286,34.195222 L 38.335786,3.2432432 C 38.310025,3.0025304 37.987878,2.8125 37.742036,2.8125 L 9.6875,2.8125 z " - style="color:#000000;fill:url(#linearGradient2100);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> - <rect - y="3.968539" - x="9.7886267" - height="29.604792" - width="2" - id="rect2793" - style="opacity:0.48044691;color:#000000;fill:url(#linearGradient2801);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:0.60818715;visibility:visible;display:inline;overflow:visible" - transform="matrix(1.000000,0.000000,-3.582731e-2,0.999358,0.000000,0.000000)" /> - <path - style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2112);stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" - d="M 9.8751008,3.3336831 C 8.1912014,3.3336831 7.5384236,4.0658459 7.4581673,5.887831 L 6.1592633,35.777198 C 7.0925916,34.170451 8.5988591,33.594437 11.011665,33.594437 L 40.963081,33.594437 L 38.137179,3.7573631 C 38.114727,3.5203092 37.793961,3.3336831 37.551434,3.3336831 L 9.8751008,3.3336831 z " - id="path2104" - sodipodi:nodetypes="cccscssc" /> - <path - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:120.00000477%;writing-mode:lr-tb;text-anchor:start;fill:#ad7fa8;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - d="M 21.12553,18.381288 C 21.050283,19.50227 21.269376,20.384155 21.782812,21.026947 C 22.296751,21.661909 23.039741,21.979388 24.011788,21.979387 C 24.97597,21.979388 25.754005,21.65799 26.345892,21.01519 C 26.945589,20.372398 27.282799,19.49443 27.357529,18.381288 C 27.431173,17.283839 27.207372,16.413709 26.686123,15.770905 C 26.165371,15.120279 25.426826,14.794959 24.470482,14.79495 C 23.521952,14.794959 22.743917,15.11636 22.136378,15.759145 C 21.536656,16.401952 21.199707,17.275998 21.12553,18.381288 M 27.29793,21.897075 C 26.787062,22.500679 26.216183,22.947501 25.58529,23.237544 C 24.962734,23.519747 24.247754,23.66085 23.44035,23.660849 C 22.092032,23.66085 21.027197,23.174832 20.245835,22.202797 C 19.472826,21.222925 19.138938,19.949092 19.244172,18.381288 C 19.349395,16.813498 19.858197,15.539665 20.770584,14.559781 C 21.682954,13.579917 22.809375,13.089981 24.149854,13.089969 C 24.957257,13.089981 25.656689,13.238924 26.24815,13.536791 C 26.840107,13.826846 27.347352,14.269749 27.76988,14.865501 L 27.873267,13.325141 L 29.554732,13.325141 L 28.973868,21.979387 C 30.129917,21.806931 31.058551,21.285637 31.759769,20.415508 C 32.469312,19.537544 32.870659,18.404812 32.963808,17.017304 C 33.020082,16.178542 32.947536,15.390722 32.746168,14.653848 C 32.552597,13.916994 32.226018,13.235002 31.766435,12.607873 C 31.020085,11.580979 30.077151,10.79708 28.937625,10.256176 C 27.806428,9.707462 26.551007,9.433097 25.171361,9.433081 C 24.207151,9.433097 23.27347,9.56244 22.370314,9.821111 C 21.467662,10.071974 20.623234,10.448244 19.837027,10.949925 C 18.552629,11.749517 17.517932,12.79994 16.732929,14.101199 C 15.956279,15.394643 15.517185,16.797819 15.415642,18.310738 C 15.331983,19.557142 15.476998,20.725151 15.85069,21.814765 C 16.232213,22.904387 16.822316,23.864664 17.621,24.695594 C 18.389368,25.51085 19.300238,26.130129 20.353615,26.553435 C 21.406448,26.984578 22.54823,27.20015 23.778962,27.200153 C 24.790178,27.20015 25.793384,27.027692 26.788584,26.682781 C 27.791068,26.345701 28.72125,25.859684 29.579139,25.224728 L 30.549801,26.529919 C 29.518874,27.2903 28.409917,27.870384 27.222932,28.270174 C 26.043227,28.677799 24.857618,28.881612 23.666104,28.881616 C 22.215881,28.881612 20.865341,28.622926 19.614483,28.105557 C 18.36308,27.596019 17.268571,26.851316 16.330955,25.871444 C 15.393328,24.89157 14.705054,23.758838 14.266133,22.47324 C 13.827731,21.179813 13.658252,19.792311 13.757696,18.310738 C 13.853452,16.88405 14.211263,15.523986 14.831129,14.230542 C 15.450993,12.937121 16.287663,11.800469 17.34115,10.820582 C 18.419191,9.825045 19.638236,9.0646655 20.998287,8.5394366 C 22.358842,8.0064001 23.779908,7.7398759 25.261489,7.7398585 C 26.923341,7.7398759 28.440813,8.080872 29.813913,8.7628469 C 31.194815,9.444854 32.325282,10.41297 33.205316,11.667193 C 33.741656,12.435425 34.132443,13.270279 34.377679,14.171752 C 34.630708,15.073243 34.724877,16.006082 34.660187,16.970271 C 34.521787,19.031929 33.789414,20.658519 32.463064,21.850041 C 31.136671,23.04157 29.374449,23.66085 27.17639,23.707883 L 27.29793,21.897075" - id="text21625" /> - <path - sodipodi:type="arc" - style="color:#000000;fill:url(#radialGradient278);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.25000024;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - id="path12511" - sodipodi:cx="55" - sodipodi:cy="125" - sodipodi:rx="14.375" - sodipodi:ry="14.375" - d="M 69.375 125 A 14.375 14.375 0 1 1 40.625,125 A 14.375 14.375 0 1 1 69.375 125 z" - transform="matrix(0.611127,0.000000,0.000000,0.611127,-24.94992,-67.63529)" - inkscape:export-filename="/home/jimmac/ximian_art/icons/nautilus/suse93/stock_new-16.png" - inkscape:export-xdpi="33.852203" - inkscape:export-ydpi="33.852203" /> - </g> -</svg> diff --git a/tests/auto/gui/image/qicon/icons/themeparent/scalable/actions/appointment-new.svg b/tests/auto/gui/image/qicon/icons/themeparent/scalable/actions/appointment-new.svg deleted file mode 100644 index 4cb14f82f0..0000000000 --- a/tests/auto/gui/image/qicon/icons/themeparent/scalable/actions/appointment-new.svg +++ /dev/null @@ -1,425 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - inkscape:export-ydpi="90.000000" - inkscape:export-xdpi="90.000000" - inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png" - width="48px" - height="48px" - id="svg11300" - sodipodi:version="0.32" - inkscape:version="0.46" - sodipodi:docbase="/home/tigert/cvs/freedesktop.org/tango-icon-theme/scalable/actions" - sodipodi:docname="appointment-new.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> - <defs - id="defs3"> - <inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 24 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="48 : 24 : 1" - inkscape:persp3d-origin="24 : 16 : 1" - id="perspective59" /> - <linearGradient - inkscape:collect="always" - id="linearGradient5204"> - <stop - style="stop-color:#c4a000;stop-opacity:1;" - offset="0" - id="stop5206" /> - <stop - style="stop-color:#c4a000;stop-opacity:0;" - offset="1" - id="stop5208" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient5196"> - <stop - style="stop-color:#c4a000;stop-opacity:1;" - offset="0" - id="stop5198" /> - <stop - style="stop-color:#c4a000;stop-opacity:0;" - offset="1" - id="stop5200" /> - </linearGradient> - <linearGradient - id="linearGradient12512"> - <stop - style="stop-color:#ffffff;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop12513" /> - <stop - style="stop-color:#fff520;stop-opacity:0.89108908;" - offset="0.50000000" - id="stop12517" /> - <stop - style="stop-color:#fff300;stop-opacity:0.0000000;" - offset="1.0000000" - id="stop12514" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient12512" - id="radialGradient278" - gradientUnits="userSpaceOnUse" - cx="55.000000" - cy="125.00000" - fx="55.000000" - fy="125.00000" - r="14.375000" /> - <linearGradient - id="linearGradient10653"> - <stop - style="stop-color:#f3f4ff;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop10655" /> - <stop - style="stop-color:#9193af;stop-opacity:1.0000000;" - offset="1.0000000" - id="stop10657" /> - </linearGradient> - <linearGradient - id="linearGradient42174"> - <stop - style="stop-color:#a0a0a0;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop42176" /> - <stop - style="stop-color:#ffffff;stop-opacity:1.0000000;" - offset="1.0000000" - id="stop42178" /> - </linearGradient> - <linearGradient - id="linearGradient2145"> - <stop - style="stop-color:#fffffd;stop-opacity:1.0000000;" - offset="0.0000000" - id="stop2147" /> - <stop - style="stop-color:#cbcbc9;stop-opacity:1.0000000;" - offset="1.0000000" - id="stop2149" /> - </linearGradient> - <linearGradient - id="linearGradient37935"> - <stop - id="stop37937" - offset="0.0000000" - style="stop-color:#9497b3;stop-opacity:1.0000000;" /> - <stop - id="stop37939" - offset="1.0000000" - style="stop-color:#4c4059;stop-opacity:1.0000000;" /> - </linearGradient> - <linearGradient - id="linearGradient2152"> - <stop - id="stop2154" - offset="0.0000000" - style="stop-color:#9aa29a;stop-opacity:1.0000000;" /> - <stop - id="stop2156" - offset="1.0000000" - style="stop-color:#b5beb5;stop-opacity:1.0000000;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient3816"> - <stop - style="stop-color:#000000;stop-opacity:1;" - offset="0" - id="stop3818" /> - <stop - style="stop-color:#000000;stop-opacity:0;" - offset="1" - id="stop3820" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3816" - id="radialGradient3822" - cx="31.112698" - cy="19.008621" - fx="31.112698" - fy="19.008621" - r="8.6620579" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2152" - id="linearGradient4307" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.123841,0.000000,0.000000,0.969691,-31.88758,-19.59492)" - x1="8.9156475" - y1="37.197018" - x2="9.8855033" - y2="52.090678" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient10653" - id="radialGradient4309" - gradientUnits="userSpaceOnUse" - cx="11.329200" - cy="10.583970" - fx="11.329200" - fy="10.583970" - r="15.532059" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient2145" - id="radialGradient4311" - gradientUnits="userSpaceOnUse" - cx="11.901996" - cy="10.045444" - fx="11.901996" - fy="10.045444" - r="29.292715" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient42174" - id="linearGradient4313" - gradientUnits="userSpaceOnUse" - x1="6.3422160" - y1="7.7893324" - x2="22.218424" - y2="25.884274" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient5196" - id="radialGradient5202" - cx="23.375" - cy="10.972863" - fx="23.375" - fy="10.972863" - r="3.3478092" - gradientTransform="matrix(3.630420,1.654030e-15,-1.608743e-15,3.742066,-61.48607,-29.18618)" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5204" - id="linearGradient5210" - x1="19.667364" - y1="4.2570662" - x2="20.329933" - y2="5.2845874" - gradientUnits="userSpaceOnUse" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient37935" - id="radialGradient5212" - gradientUnits="userSpaceOnUse" - cx="8.7468252" - cy="6.8283234" - fx="8.7468252" - fy="6.8283234" - r="29.889715" /> - </defs> - <sodipodi:namedview - stroke="#c4a000" - fill="#babdb6" - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="0.25490196" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="11.313708" - inkscape:cx="13.2248" - inkscape:cy="25.106052" - inkscape:current-layer="layer1" - showgrid="false" - inkscape:grid-bbox="true" - inkscape:document-units="px" - inkscape:showpageshadow="false" - inkscape:window-width="833" - inkscape:window-height="772" - inkscape:window-x="305" - inkscape:window-y="76" /> - <metadata - id="metadata4"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:creator> - <cc:Agent> - <dc:title>Jakub Steiner</dc:title> - </cc:Agent> - </dc:creator> - <dc:source>http://jimmac.musichall.cz</dc:source> - <cc:license - rdf:resource="http://creativecommons.org/licenses/publicdomain/" /> - <dc:title>New Appointment</dc:title> - <dc:subject> - <rdf:Bag> - <rdf:li>appointment</rdf:li> - <rdf:li>new</rdf:li> - <rdf:li>meeting</rdf:li> - <rdf:li>rvsp</rdf:li> - </rdf:Bag> - </dc:subject> - </cc:Work> - <cc:License - rdf:about="http://creativecommons.org/licenses/publicdomain/"> - <cc:permits - rdf:resource="http://creativecommons.org/ns#Reproduction" /> - <cc:permits - rdf:resource="http://creativecommons.org/ns#Distribution" /> - <cc:permits - rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> - </cc:License> - </rdf:RDF> - </metadata> - <g - id="layer1" - inkscape:label="Layer 1" - inkscape:groupmode="layer"> - <path - d="M 39.774755 19.008621 A 8.6620579 8.6620579 0 1 1 22.45064,19.008621 A 8.6620579 8.6620579 0 1 1 39.774755 19.008621 z" - sodipodi:ry="8.6620579" - sodipodi:rx="8.6620579" - sodipodi:cy="19.008621" - sodipodi:cx="31.112698" - id="path4318" - style="opacity:1;color:#000000;fill:url(#radialGradient3822);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" - sodipodi:type="arc" - transform="matrix(2.563158,0.000000,0.000000,1.219602,-55.98414,14.04144)" /> - <path - sodipodi:nodetypes="cccc" - id="path14341" - d="M 18.587591,1.403729 L 4.226755,18.096665 L 5.4854717,19.339844 L 18.587591,1.403729 z " - style="color:#000000;fill:url(#linearGradient4307);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> - <path - sodipodi:nodetypes="cccc" - id="path18921" - d="M 18.467176,1.3138035 L 5.6605716,19.072612 L 7.4900985,20.687913 L 18.467176,1.3138035 z " - style="fill:#fefefe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" /> - <path - transform="matrix(1.431529,0.000000,0.000000,1.431529,0.569459,-1.654618)" - d="M 31.160714 16.910715 A 14.910714 14.910714 0 1 1 1.3392859,16.910715 A 14.910714 14.910714 0 1 1 31.160714 16.910715 z" - sodipodi:ry="14.910714" - sodipodi:rx="14.910714" - sodipodi:cy="16.910715" - sodipodi:cx="16.25" - id="path27786" - style="fill:url(#radialGradient5212);fill-opacity:1;fill-rule:evenodd;stroke:#605773;stroke-width:0.69855404;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" - sodipodi:type="arc" /> - <path - transform="matrix(1.163838,0.000000,0.000000,1.163838,4.824801,2.777556)" - d="M 31.160714 16.910715 A 14.910714 14.910714 0 1 1 1.3392859,16.910715 A 14.910714 14.910714 0 1 1 31.160714 16.910715 z" - sodipodi:ry="14.910714" - sodipodi:rx="14.910714" - sodipodi:cy="16.910715" - sodipodi:cx="16.25" - id="path35549" - style="fill:url(#radialGradient4311);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4313);stroke-width:0.71139598;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" - sodipodi:type="arc" /> - <path - sodipodi:type="arc" - style="opacity:1;color:#000000;fill:url(#radialGradient5202);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5210);stroke-width:0.56498736;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" - id="path4120" - sodipodi:cx="23.375" - sodipodi:cy="11.875" - sodipodi:rx="8.5" - sodipodi:ry="8.5" - d="M 16.679382,6.6387137 A 8.5,8.5 0 0 1 23.332691,3.3751053 L 23.375,11.875 z" - transform="matrix(1.769951,0.000000,0.000000,1.769951,-17.02424,1.610741)" - sodipodi:start="3.8052902" - sodipodi:end="4.7074114" /> - <path - transform="matrix(2.073295,0.000000,0.000000,2.073295,-7.310224,-13.13682)" - d="M 16.40625 17.28125 A 1.21875 1.21875 0 1 1 13.96875,17.28125 A 1.21875 1.21875 0 1 1 16.40625 17.28125 z" - sodipodi:ry="1.21875" - sodipodi:rx="1.21875" - sodipodi:cy="17.28125" - sodipodi:cx="15.1875" - id="path34778" - style="fill:#f3f3f3;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.48232403;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;stroke-dasharray:none" - sodipodi:type="arc" /> - <path - id="path35559" - d="M 22.176614,20.718014 L 13.155702,13.140282" - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> - <path - id="path35561" - d="M 19.408614,29.776506 L 22.368655,25.283228" - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - sodipodi:nodetypes="cc" /> - <path - transform="matrix(2.749493,0.000000,0.000000,2.749493,-22.30073,-12.40939)" - d="M 17.324117 7.6932044 A 0.61871845 0.61871845 0 1 1 16.08668,7.6932044 A 0.61871845 0.61871845 0 1 1 17.324117 7.6932044 z" - sodipodi:ry="0.61871845" - sodipodi:rx="0.61871845" - sodipodi:cy="7.6932044" - sodipodi:cx="16.705399" - id="path35563" - style="fill:#b6b9b1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.36871839;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;opacity:1" - sodipodi:type="arc" /> - <path - transform="matrix(2.749493,0.000000,0.000000,2.749493,-22.30073,14.80922)" - d="M 17.324117 7.6932044 A 0.61871845 0.61871845 0 1 1 16.08668,7.6932044 A 0.61871845 0.61871845 0 1 1 17.324117 7.6932044 z" - sodipodi:ry="0.61871845" - sodipodi:rx="0.61871845" - sodipodi:cy="7.6932044" - sodipodi:cx="16.705399" - id="path35565" - style="fill:#b6b9b1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.36871839;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;opacity:1" - sodipodi:type="arc" /> - <path - transform="matrix(2.749493,0.000000,0.000000,2.749493,-35.91004,1.199890)" - d="M 17.324117 7.6932044 A 0.61871845 0.61871845 0 1 1 16.08668,7.6932044 A 0.61871845 0.61871845 0 1 1 17.324117 7.6932044 z" - sodipodi:ry="0.61871845" - sodipodi:rx="0.61871845" - sodipodi:cy="7.6932044" - sodipodi:cx="16.705399" - id="path35567" - style="fill:#b6b9b1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.36871839;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;opacity:1" - sodipodi:type="arc" /> - <path - transform="matrix(2.749493,0.000000,0.000000,2.749493,-8.691448,1.199890)" - d="M 17.324117 7.6932044 A 0.61871845 0.61871845 0 1 1 16.08668,7.6932044 A 0.61871845 0.61871845 0 1 1 17.324117 7.6932044 z" - sodipodi:ry="0.61871845" - sodipodi:rx="0.61871845" - sodipodi:cy="7.6932044" - sodipodi:cx="16.705399" - id="path35569" - style="fill:#b6b9b1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.36871839;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;opacity:1" - sodipodi:type="arc" /> - <path - sodipodi:type="arc" - style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#radialGradient4309);stroke-width:0.73656511;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" - id="path10651" - sodipodi:cx="16.25" - sodipodi:cy="16.910715" - sodipodi:rx="14.910714" - sodipodi:ry="14.910714" - d="M 31.160714 16.910715 A 14.910714 14.910714 0 1 1 1.3392859,16.910715 A 14.910714 14.910714 0 1 1 31.160714 16.910715 z" - transform="matrix(1.357654,0.000000,0.000000,1.357654,1.769896,-0.493735)" /> - <path - sodipodi:type="arc" - style="color:#000000;fill:url(#radialGradient278);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.25000024;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - id="path12511" - sodipodi:cx="55" - sodipodi:cy="125" - sodipodi:rx="14.375" - sodipodi:ry="14.375" - d="M 69.375 125 A 14.375 14.375 0 1 1 40.625,125 A 14.375 14.375 0 1 1 69.375 125 z" - transform="matrix(0.611127,0.000000,0.000000,0.611127,5.544052,-66.92818)" - inkscape:export-filename="/home/jimmac/ximian_art/icons/nautilus/suse93/stock_new-16.png" - inkscape:export-xdpi="33.852203" - inkscape:export-ydpi="33.852203" /> - </g> -</svg> diff --git a/tests/auto/gui/image/qicon/image.png b/tests/auto/gui/image/qicon/image.png Binary files differdeleted file mode 100644 index 8d703640c1..0000000000 --- a/tests/auto/gui/image/qicon/image.png +++ /dev/null diff --git a/tests/auto/gui/image/qicon/qicon.pro b/tests/auto/gui/image/qicon/qicon.pro deleted file mode 100644 index c44c080ced..0000000000 --- a/tests/auto/gui/image/qicon/qicon.pro +++ /dev/null @@ -1,12 +0,0 @@ -CONFIG += testcase -TARGET = tst_qicon - -QT += widgets testlib -SOURCES += tst_qicon.cpp -RESOURCES = tst_qicon.qrc - -wince* { - QT += xml svg - DEPLOYMENT_PLUGIN += qsvg -} -TESTDATA += icons/* *.png *.svg *.svgz diff --git a/tests/auto/gui/image/qicon/rect.png b/tests/auto/gui/image/qicon/rect.png Binary files differdeleted file mode 100644 index b5d3ecbddf..0000000000 --- a/tests/auto/gui/image/qicon/rect.png +++ /dev/null diff --git a/tests/auto/gui/image/qicon/tst_qicon.cpp b/tests/auto/gui/image/qicon/tst_qicon.cpp deleted file mode 100644 index 4a9ab93921..0000000000 --- a/tests/auto/gui/image/qicon/tst_qicon.cpp +++ /dev/null @@ -1,637 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include <QtTest/QtTest> -#include <QImageReader> -#include <qicon.h> -#include <qiconengine.h> - -Q_DECLARE_METATYPE(QSize) - -class tst_QIcon : public QObject -{ - Q_OBJECT -public: - tst_QIcon(); - -private slots: - void actualSize_data(); // test with 1 pixmap - void actualSize(); - void actualSize2_data(); // test with 2 pixmaps with different aspect ratio - void actualSize2(); - void isNull(); - void swap(); - void bestMatch(); - void cacheKey(); - void detach(); - void addFile(); - void availableSizes(); - void name(); - void streamAvailableSizes_data(); - void streamAvailableSizes(); - void fromTheme(); - - void task184901_badCache(); - void task223279_inconsistentAddFile(); - -private: - bool haveImageFormat(QByteArray const&); - - const static QIcon staticIcon; -}; - -// Creating an icon statically should not cause a crash. -// But we do not officially support this. See QTBUG-8666 -const QIcon tst_QIcon::staticIcon = QIcon::fromTheme("edit-find"); - -bool tst_QIcon::haveImageFormat(QByteArray const& desiredFormat) -{ - return QImageReader::supportedImageFormats().contains(desiredFormat); -} - -tst_QIcon::tst_QIcon() -{ -} - -void tst_QIcon::actualSize_data() -{ - QTest::addColumn<QString>("source"); - QTest::addColumn<QSize>("argument"); - QTest::addColumn<QSize>("result"); - - // square image - QTest::newRow("resource0") << ":/image.png" << QSize(128, 128) << QSize(128, 128); - QTest::newRow("resource1") << ":/image.png" << QSize( 64, 64) << QSize( 64, 64); - QTest::newRow("resource2") << ":/image.png" << QSize( 32, 64) << QSize( 32, 32); - QTest::newRow("resource3") << ":/image.png" << QSize( 16, 64) << QSize( 16, 16); - QTest::newRow("resource4") << ":/image.png" << QSize( 16, 128) << QSize( 16, 16); - QTest::newRow("resource5") << ":/image.png" << QSize( 128, 16) << QSize( 16, 16); - QTest::newRow("resource6") << ":/image.png" << QSize( 150, 150) << QSize( 128, 128); - // rect image - QTest::newRow("resource7") << ":/rect.png" << QSize( 20, 40) << QSize( 20, 40); - QTest::newRow("resource8") << ":/rect.png" << QSize( 10, 20) << QSize( 10, 20); - QTest::newRow("resource9") << ":/rect.png" << QSize( 15, 50) << QSize( 15, 30); - QTest::newRow("resource10") << ":/rect.png" << QSize( 25, 50) << QSize( 20, 40); - - const QString prefix = QFileInfo(QFINDTESTDATA("icons")).absolutePath() + "/"; - QTest::newRow("external0") << prefix + "image.png" << QSize(128, 128) << QSize(128, 128); - QTest::newRow("external1") << prefix + "image.png" << QSize( 64, 64) << QSize( 64, 64); - QTest::newRow("external2") << prefix + "image.png" << QSize( 32, 64) << QSize( 32, 32); - QTest::newRow("external3") << prefix + "image.png" << QSize( 16, 64) << QSize( 16, 16); - QTest::newRow("external4") << prefix + "image.png" << QSize( 16, 128) << QSize( 16, 16); - QTest::newRow("external5") << prefix + "image.png" << QSize( 128, 16) << QSize( 16, 16); - QTest::newRow("external6") << prefix + "image.png" << QSize( 150, 150) << QSize( 128, 128); - // rect image - QTest::newRow("external7") << ":/rect.png" << QSize( 20, 40) << QSize( 20, 40); - QTest::newRow("external8") << ":/rect.png" << QSize( 10, 20) << QSize( 10, 20); - QTest::newRow("external9") << ":/rect.png" << QSize( 15, 50) << QSize( 15, 30); - QTest::newRow("external10") << ":/rect.png" << QSize( 25, 50) << QSize( 20, 40); -} - -void tst_QIcon::actualSize() -{ - QFETCH(QString, source); - QFETCH(QSize, argument); - QFETCH(QSize, result); - - { - QPixmap pixmap(source); - QIcon icon(pixmap); - QCOMPARE(icon.actualSize(argument), result); - QCOMPARE(icon.pixmap(argument).size(), result); - } - - { - QIcon icon(source); - QCOMPARE(icon.actualSize(argument), result); - QCOMPARE(icon.pixmap(argument).size(), result); - } -} - -void tst_QIcon::actualSize2_data() -{ - QTest::addColumn<QSize>("argument"); - QTest::addColumn<QSize>("result"); - - // two images - 128x128 and 20x40. Let the games begin - QTest::newRow("trivial1") << QSize( 128, 128) << QSize( 128, 128); - QTest::newRow("trivial2") << QSize( 20, 40) << QSize( 20, 40); - - // QIcon chooses the one with the smallest area to choose the pixmap - QTest::newRow("best1") << QSize( 100, 100) << QSize( 100, 100); - QTest::newRow("best2") << QSize( 20, 20) << QSize( 10, 20); - QTest::newRow("best3") << QSize( 15, 30) << QSize( 15, 30); - QTest::newRow("best4") << QSize( 5, 5) << QSize( 2, 5); - QTest::newRow("best5") << QSize( 10, 15) << QSize( 7, 15); -} - -void tst_QIcon::actualSize2() -{ - QIcon icon; - const QString prefix = QFileInfo(QFINDTESTDATA("icons")).absolutePath() + "/"; - - icon.addPixmap(QPixmap(prefix + "image.png")); - icon.addPixmap(QPixmap(prefix + "rect.png")); - - QFETCH(QSize, argument); - QFETCH(QSize, result); - - QCOMPARE(icon.actualSize(argument), result); - QCOMPARE(icon.pixmap(argument).size(), result); -} - -void tst_QIcon::isNull() { - // test default constructor - QIcon defaultConstructor; - QVERIFY(defaultConstructor.isNull()); - - // test copy constructor - QVERIFY(QIcon(defaultConstructor).isNull()); - - // test pixmap constructor - QPixmap nullPixmap; - QVERIFY(QIcon(nullPixmap).isNull()); - - // test string constructor with empty string - QIcon iconEmptyString = QIcon(QString()); - QVERIFY(iconEmptyString.isNull()); - QVERIFY(!iconEmptyString.actualSize(QSize(32, 32)).isValid());; - - // test string constructor with non-existing file - QIcon iconNoFile = QIcon("imagedoesnotexist"); - QVERIFY(!iconNoFile.isNull()); - QVERIFY(!iconNoFile.actualSize(QSize(32, 32)).isValid()); - - // test string constructor with non-existing file with suffix - QIcon iconNoFileSuffix = QIcon("imagedoesnotexist.png"); - QVERIFY(!iconNoFileSuffix.isNull()); - QVERIFY(!iconNoFileSuffix.actualSize(QSize(32, 32)).isValid()); - - const QString prefix = QFileInfo(QFINDTESTDATA("icons")).absolutePath() + "/"; - // test string constructor with existing file but unsupported format - QIcon iconUnsupportedFormat = QIcon(prefix + "tst_qicon.cpp"); - QVERIFY(!iconUnsupportedFormat.isNull()); - QVERIFY(!iconUnsupportedFormat.actualSize(QSize(32, 32)).isValid()); - - // test string constructor with existing file and supported format - QIcon iconSupportedFormat = QIcon(prefix + "image.png"); - QVERIFY(!iconSupportedFormat.isNull()); - QVERIFY(iconSupportedFormat.actualSize(QSize(32, 32)).isValid()); -} - -void tst_QIcon::swap() -{ - QPixmap p1(1, 1), p2(2, 2); - p1.fill(Qt::black); - p2.fill(Qt::black); - - QIcon i1(p1), i2(p2); - const qint64 i1k = i1.cacheKey(); - const qint64 i2k = i2.cacheKey(); - QVERIFY(i1k != i2k); - i1.swap(i2); - QCOMPARE(i1.cacheKey(), i2k); - QCOMPARE(i2.cacheKey(), i1k); -} - -void tst_QIcon::bestMatch() -{ - QPixmap p1(1, 1); - QPixmap p2(2, 2); - QPixmap p3(3, 3); - QPixmap p4(4, 4); - QPixmap p5(5, 5); - QPixmap p6(6, 6); - QPixmap p7(7, 7); - QPixmap p8(8, 8); - - p1.fill(Qt::black); - p2.fill(Qt::black); - p3.fill(Qt::black); - p4.fill(Qt::black); - p5.fill(Qt::black); - p6.fill(Qt::black); - p7.fill(Qt::black); - p8.fill(Qt::black); - - for (int i = 0; i < 4; ++i) { - for (int j = 0; j < 2; ++j) { - QIcon::State state = (j == 0) ? QIcon::On : QIcon::Off; - QIcon::State oppositeState = (state == QIcon::On) ? QIcon::Off - : QIcon::On; - QIcon::Mode mode; - QIcon::Mode oppositeMode; - - QIcon icon; - - switch (i) { - case 0: - default: - mode = QIcon::Normal; - oppositeMode = QIcon::Active; - break; - case 1: - mode = QIcon::Active; - oppositeMode = QIcon::Normal; - break; - case 2: - mode = QIcon::Disabled; - oppositeMode = QIcon::Selected; - break; - case 3: - mode = QIcon::Selected; - oppositeMode = QIcon::Disabled; - } - - /* - The test mirrors the code in - QPixmapIconEngine::bestMatch(), to make sure that - nobody breaks QPixmapIconEngine by mistake. Before - you change this test or the code that it tests, - please talk to the maintainer if possible. - */ - if (mode == QIcon::Disabled || mode == QIcon::Selected) { - icon.addPixmap(p1, oppositeMode, oppositeState); - QVERIFY(icon.pixmap(100, mode, state).size() == p1.size()); - - icon.addPixmap(p2, oppositeMode, state); - QVERIFY(icon.pixmap(100, mode, state).size() == p2.size()); - - icon.addPixmap(p3, QIcon::Active, oppositeState); - QVERIFY(icon.pixmap(100, mode, state).size() == p3.size()); - - icon.addPixmap(p4, QIcon::Normal, oppositeState); - QVERIFY(icon.pixmap(100, mode, state).size() == p4.size()); - - icon.addPixmap(p5, mode, oppositeState); - QVERIFY(icon.pixmap(100, mode, state).size() == p5.size()); - - icon.addPixmap(p6, QIcon::Active, state); - QVERIFY(icon.pixmap(100, mode, state).size() == p6.size()); - - icon.addPixmap(p7, QIcon::Normal, state); - QVERIFY(icon.pixmap(100, mode, state).size() == p7.size()); - - icon.addPixmap(p8, mode, state); - QVERIFY(icon.pixmap(100, mode, state).size() == p8.size()); - } else { - icon.addPixmap(p1, QIcon::Selected, oppositeState); - QVERIFY(icon.pixmap(100, mode, state).size() == p1.size()); - - icon.addPixmap(p2, QIcon::Disabled, oppositeState); - QVERIFY(icon.pixmap(100, mode, state).size() == p2.size()); - - icon.addPixmap(p3, QIcon::Selected, state); - QVERIFY(icon.pixmap(100, mode, state).size() == p3.size()); - - icon.addPixmap(p4, QIcon::Disabled, state); - QVERIFY(icon.pixmap(100, mode, state).size() == p4.size()); - - icon.addPixmap(p5, oppositeMode, oppositeState); - QVERIFY(icon.pixmap(100, mode, state).size() == p5.size()); - - icon.addPixmap(p6, mode, oppositeState); - QVERIFY(icon.pixmap(100, mode, state).size() == p6.size()); - - icon.addPixmap(p7, oppositeMode, state); - QVERIFY(icon.pixmap(100, mode, state).size() == p7.size()); - - icon.addPixmap(p8, mode, state); - QVERIFY(icon.pixmap(100, mode, state).size() == p8.size()); - } - } - } -} - -void tst_QIcon::cacheKey() -{ - QIcon icon1("image.png"); - qint64 icon1_key = icon1.cacheKey(); - QIcon icon2 = icon1; - - QVERIFY(icon2.cacheKey() == icon1.cacheKey()); - icon2.detach(); - QVERIFY(icon2.cacheKey() != icon1.cacheKey()); - QVERIFY(icon1.cacheKey() == icon1_key); -} - -void tst_QIcon::detach() -{ - QImage img(32, 32, QImage::Format_ARGB32_Premultiplied); - img.fill(0xffff0000); - QIcon icon1(QPixmap::fromImage(img)); - QIcon icon2 = icon1; - icon2.addFile(QFINDTESTDATA("image.png"), QSize(64, 64)); - - QImage img1 = icon1.pixmap(64, 64).toImage(); - QImage img2 = icon2.pixmap(64, 64).toImage(); - QVERIFY(img1 != img2); - - img1 = icon1.pixmap(32, 32).toImage(); - img2 = icon2.pixmap(32, 32).toImage(); - QVERIFY(img1 == img2); -} - -void tst_QIcon::addFile() -{ - QIcon icon; - icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-open-16.png")); - icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-open-32.png")); - icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-open-128.png")); - icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-save-16.png"), QSize(), QIcon::Selected); - icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-save-32.png"), QSize(), QIcon::Selected); - icon.addFile(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-save-128.png"), QSize(), QIcon::Selected); - -#ifndef Q_OS_WINCE - QVERIFY(icon.pixmap(16, QIcon::Normal).toImage() == - QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-open-16.png")).toImage()); - QVERIFY(icon.pixmap(32, QIcon::Normal).toImage() == - QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-open-32.png")).toImage()); - QVERIFY(icon.pixmap(128, QIcon::Normal).toImage() == - QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-open-128.png")).toImage()); - QVERIFY(icon.pixmap(16, QIcon::Selected).toImage() == - QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-save-16.png")).toImage()); - QVERIFY(icon.pixmap(32, QIcon::Selected).toImage() == - QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-save-32.png")).toImage()); - QVERIFY(icon.pixmap(128, QIcon::Selected).toImage() == - QPixmap(QLatin1String(":/trolltech/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(":/trolltech/styles/commonstyle/images/standardbutton-open-16.png")).toImage()); - QVERIFY(icon.pixmap(16, QIcon::Selected).toImage() == - QPixmap(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-save-16.png")).toImage()); -#endif -} - -static bool sizeLess(const QSize &a, const QSize &b) -{ - return a.width() < b.width(); -} - -void tst_QIcon::availableSizes() -{ - { - QIcon icon; - icon.addFile("image.png", QSize(32,32)); - icon.addFile("image.png", QSize(64,64)); - icon.addFile("image.png", QSize(128,128)); - icon.addFile("image.png", QSize(256,256), QIcon::Disabled); - icon.addFile("image.png", QSize(16,16), QIcon::Normal, QIcon::On); - - QList<QSize> availableSizes = icon.availableSizes(); - QCOMPARE(availableSizes.size(), 3); - qSort(availableSizes.begin(), availableSizes.end(), sizeLess); - QCOMPARE(availableSizes.at(0), QSize(32,32)); - QCOMPARE(availableSizes.at(1), QSize(64,64)); - QCOMPARE(availableSizes.at(2), QSize(128,128)); - - availableSizes = icon.availableSizes(QIcon::Disabled); - QCOMPARE(availableSizes.size(), 1); - QCOMPARE(availableSizes.at(0), QSize(256,256)); - - availableSizes = icon.availableSizes(QIcon::Normal, QIcon::On); - QCOMPARE(availableSizes.size(), 1); - QCOMPARE(availableSizes.at(0), QSize(16,16)); - } - - { - // we try to load an icon from resources - QIcon icon(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-open-16.png")); - QList<QSize> availableSizes = icon.availableSizes(); - QCOMPARE(availableSizes.size(), 1); - QCOMPARE(availableSizes.at(0), QSize(16, 16)); - } - - { - // load an icon from binary data. - QPixmap pix; - QFile file(QLatin1String(":/trolltech/styles/commonstyle/images/standardbutton-open-16.png")); - QVERIFY(file.open(QIODevice::ReadOnly)); - uchar *data = file.map(0, file.size()); - QVERIFY(data != 0); - pix.loadFromData(data, file.size()); - QIcon icon(pix); - - QList<QSize> availableSizes = icon.availableSizes(); - QCOMPARE(availableSizes.size(), 1); - QCOMPARE(availableSizes.at(0), QSize(16,16)); - } - - { - // there shouldn't be available sizes for invalid images! - QVERIFY(QIcon(QLatin1String("")).availableSizes().isEmpty()); - QVERIFY(QIcon(QLatin1String("non-existing.png")).availableSizes().isEmpty()); - } -} - -void tst_QIcon::name() -{ - { - // No name if icon does not come from a theme - QIcon icon(":/image.png"); - QString name = icon.name(); - QVERIFY(name.isEmpty()); - } - - { - // Getting the name of an icon coming from a theme should work - QString searchPath = QLatin1String(":/icons"); - QIcon::setThemeSearchPaths(QStringList() << searchPath); - QString themeName("testtheme"); - QIcon::setThemeName(themeName); - - QIcon icon = QIcon::fromTheme("appointment-new"); - QString name = icon.name(); - QCOMPARE(name, QLatin1String("appointment-new")); - } -} - -void tst_QIcon::streamAvailableSizes_data() -{ - QTest::addColumn<QIcon>("icon"); - - QIcon icon; - icon.addFile(":/image.png", QSize(32,32)); - QTest::newRow( "32x32" ) << icon; - icon.addFile(":/image.png", QSize(64,64)); - QTest::newRow( "64x64" ) << icon; - icon.addFile(":/image.png", QSize(128,128)); - QTest::newRow( "128x128" ) << icon; - icon.addFile(":/image.png", QSize(256,256)); - QTest::newRow( "256x256" ) << icon; -} - -void tst_QIcon::streamAvailableSizes() -{ - QFETCH(QIcon, icon); - - QByteArray ba; - // write to QByteArray - { - QBuffer buffer(&ba); - buffer.open(QIODevice::WriteOnly); - QDataStream stream(&buffer); - stream << icon; - } - - // read from QByteArray - { - QBuffer buffer(&ba); - buffer.open(QIODevice::ReadOnly); - QDataStream stream(&buffer); - QIcon i; - stream >> i; - QCOMPARE(i.isNull(), icon.isNull()); - QCOMPARE(i.availableSizes(), icon.availableSizes()); - } -} - - -static inline bool operator<(const QSize &lhs, const QSize &rhs) -{ - if (lhs.width() < rhs.width()) - return true; - else if (lhs.width() == lhs.width()) - return lhs.height() < lhs.height(); - return false; -} - -void tst_QIcon::task184901_badCache() -{ - QPixmap pm(QFINDTESTDATA("image.png")); - QIcon icon(pm); - - //the disabled icon must have an effect (grayed) - QVERIFY(icon.pixmap(32, QIcon::Normal).toImage() != icon.pixmap(32, QIcon::Disabled).toImage()); - - icon.addPixmap(pm, QIcon::Disabled); - //the disabled icon must now be the same as the normal one. - QVERIFY( icon.pixmap(32, QIcon::Normal).toImage() == icon.pixmap(32, QIcon::Disabled).toImage() ); -} - -void tst_QIcon::fromTheme() -{ - QString searchPath = QLatin1String(":/icons"); - QIcon::setThemeSearchPaths(QStringList() << searchPath); - QVERIFY(QIcon::themeSearchPaths().size() == 1); - QCOMPARE(searchPath, QIcon::themeSearchPaths()[0]); - - QString themeName("testtheme"); - QIcon::setThemeName(themeName); - QCOMPARE(QIcon::themeName(), themeName); - - // Test normal icon - QIcon appointmentIcon = QIcon::fromTheme("appointment-new"); - QVERIFY(!appointmentIcon.isNull()); - QVERIFY(!appointmentIcon.availableSizes(QIcon::Normal, QIcon::Off).isEmpty()); - QVERIFY(appointmentIcon.availableSizes().contains(QSize(16, 16))); - QVERIFY(appointmentIcon.availableSizes().contains(QSize(32, 32))); - QVERIFY(appointmentIcon.availableSizes().contains(QSize(22, 22))); - - // Test icon from parent theme - QIcon abIcon = QIcon::fromTheme("address-book-new"); - QVERIFY(!abIcon.isNull()); - QVERIFY(QIcon::hasThemeIcon("address-book-new")); - QVERIFY(!abIcon.availableSizes().isEmpty()); - - // Test non existing icon - QIcon noIcon = QIcon::fromTheme("broken-icon"); - QVERIFY(noIcon.isNull()); - QVERIFY(!QIcon::hasThemeIcon("broken-icon")); - - // Test non existing icon with fallback - noIcon = QIcon::fromTheme("broken-icon", abIcon); - QVERIFY(noIcon.cacheKey() == abIcon.cacheKey()); - - // Test svg-only icon - noIcon = QIcon::fromTheme("svg-icon", abIcon); - QVERIFY(!noIcon.availableSizes().isEmpty()); - - QByteArray ba; - // write to QByteArray - { - QBuffer buffer(&ba); - buffer.open(QIODevice::WriteOnly); - QDataStream stream(&buffer); - stream << abIcon; - } - - // read from QByteArray - { - QBuffer buffer(&ba); - buffer.open(QIODevice::ReadOnly); - QDataStream stream(&buffer); - QIcon i; - stream >> i; - QCOMPARE(i.isNull(), abIcon.isNull()); - QCOMPARE(i.availableSizes(), abIcon.availableSizes()); - } - - // Make sure setting the theme name clears the state - QIcon::setThemeName(""); - abIcon = QIcon::fromTheme("address-book-new"); - QVERIFY(abIcon.isNull()); -} - - -void tst_QIcon::task223279_inconsistentAddFile() -{ - QIcon icon1; - icon1.addFile(QLatin1String(":/trolltech/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(":/trolltech/styles/commonstyle/images/standardbutton-open-16.png")); - icon2.addFile(QLatin1String("IconThatDoesntExist")); - QPixmap pm2 = icon1.pixmap(32, 32); - - QCOMPARE(pm1.isNull(), false); - QCOMPARE(pm1.size(), QSize(16,16)); - QCOMPARE(pm1.isNull(), pm2.isNull()); - QCOMPARE(pm1.size(), pm2.size()); -} - - -QTEST_MAIN(tst_QIcon) -#include "tst_qicon.moc" diff --git a/tests/auto/gui/image/qicon/tst_qicon.qrc b/tests/auto/gui/image/qicon/tst_qicon.qrc deleted file mode 100644 index 7925a33c84..0000000000 --- a/tests/auto/gui/image/qicon/tst_qicon.qrc +++ /dev/null @@ -1,20 +0,0 @@ -<!DOCTYPE RCC><RCC version="1.0"> -<qresource prefix="/"> -<file>image.png</file> -<file>rect.png</file> -<file>./icons/testtheme/16x16/actions/appointment-new.png</file> -<file>./icons/testtheme/22x22/actions/appointment-new.png</file> -<file>./icons/testtheme/32x32/actions/appointment-new.png</file> -<file>./icons/testtheme/index.theme</file> -<file>./icons/testtheme/scalable/actions/svg-only.svg</file> -<file>./icons/themeparent/16x16/actions/address-book-new.png</file> -<file>./icons/themeparent/16x16/actions/appointment-new.png</file> -<file>./icons/themeparent/22x22/actions/address-book-new.png</file> -<file>./icons/themeparent/22x22/actions/appointment-new.png</file> -<file>./icons/themeparent/32x32/actions/address-book-new.png</file> -<file>./icons/themeparent/32x32/actions/appointment-new.png</file> -<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> -</qresource> -</RCC> diff --git a/tests/auto/gui/image/qimagereader/qimagereader.pro b/tests/auto/gui/image/qimagereader/qimagereader.pro index 14d23f05ba..7686643b3a 100644 --- a/tests/auto/gui/image/qimagereader/qimagereader.pro +++ b/tests/auto/gui/image/qimagereader/qimagereader.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qimagereader SOURCES += tst_qimagereader.cpp MOC_DIR=tmp -QT += widgets widgets-private core-private gui-private network testlib +QT += core-private gui-private network testlib RESOURCES += qimagereader.qrc win32-msvc:QMAKE_CXXFLAGS -= -Zm200 diff --git a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp index 6f6662a80f..876d69ea1c 100644 --- a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp +++ b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp @@ -48,7 +48,6 @@ #include <QImage> #include <QImageReader> #include <QImageWriter> -#include <QLabel> #include <QPixmap> #include <QSet> #include <QTcpSocket> diff --git a/tests/auto/gui/image/qimagewriter/qimagewriter.pro b/tests/auto/gui/image/qimagewriter/qimagewriter.pro index b6c80b8d62..f77ff0659b 100644 --- a/tests/auto/gui/image/qimagewriter/qimagewriter.pro +++ b/tests/auto/gui/image/qimagewriter/qimagewriter.pro @@ -1,6 +1,6 @@ CONFIG += testcase TARGET = tst_qimagewriter -QT += widgets testlib +QT += testlib SOURCES += tst_qimagewriter.cpp MOC_DIR=tmp win32-msvc:QMAKE_CXXFLAGS -= -Zm200 diff --git a/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp b/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp index ad9da27c7e..932d652b69 100644 --- a/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp +++ b/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp @@ -48,7 +48,6 @@ #include <QImage> #include <QImageReader> #include <QImageWriter> -#include <QLabel> #include <QPainter> #include <QSet> diff --git a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp index 563baef486..c7652e445f 100644 --- a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp +++ b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp @@ -48,7 +48,6 @@ #include <qmatrix.h> #include <qdesktopwidget.h> #include <qpaintengine.h> -#include <qtreewidget.h> #include <qsplashscreen.h> #include <qplatformpixmap_qpa.h> @@ -111,7 +110,6 @@ private slots: void setGetMask(); void cacheKey(); void drawBitmap(); - void grabWidget(); void grabWindow(); void isNull(); void task_246446(); @@ -718,47 +716,6 @@ void tst_QPixmap::drawBitmap() QVERIFY(lenientCompare(pixmap, expected)); } -void tst_QPixmap::grabWidget() -{ - for (int opaque = 0; opaque < 2; ++opaque) { - QWidget widget; - QImage image(128, 128, opaque ? QImage::Format_RGB32 : QImage::Format_ARGB32_Premultiplied); - for (int row = 0; row < image.height(); ++row) { - QRgb *line = reinterpret_cast<QRgb *>(image.scanLine(row)); - for (int col = 0; col < image.width(); ++col) - line[col] = qRgba(rand() & 255, row, col, opaque ? 255 : 127); - } - - QPalette pal = widget.palette(); - pal.setBrush(QPalette::Window, QBrush(image)); - widget.setPalette(pal); - widget.resize(128, 128); - - QPixmap expected(64, 64); - if (!opaque) - expected.fill(Qt::transparent); - - QPainter p(&expected); - p.translate(-64, -64); - p.drawTiledPixmap(0, 0, 128, 128, pal.brush(QPalette::Window).texture(), 0, 0); - p.end(); - - QPixmap actual = QPixmap::grabWidget(&widget, QRect(64, 64, 64, 64)); - QVERIFY(lenientCompare(actual, expected)); - - actual = QPixmap::grabWidget(&widget, 64, 64); - QVERIFY(lenientCompare(actual, expected)); - - // Make sure a widget that is not yet shown is grabbed correctly. - QTreeWidget widget2; - actual = QPixmap::grabWidget(&widget2); - widget2.show(); - expected = QPixmap::grabWidget(&widget2); - - QVERIFY(lenientCompare(actual, expected)); - } -} - void tst_QPixmap::grabWindow() { // ### fixme: Check platforms diff --git a/tests/auto/gui/image/qpixmapfilter/noise.png b/tests/auto/gui/image/qpixmapfilter/noise.png Binary files differdeleted file mode 100644 index 1bebaf528e..0000000000 --- a/tests/auto/gui/image/qpixmapfilter/noise.png +++ /dev/null diff --git a/tests/auto/gui/image/qpixmapfilter/qpixmapfilter.pro b/tests/auto/gui/image/qpixmapfilter/qpixmapfilter.pro deleted file mode 100644 index 872686b82f..0000000000 --- a/tests/auto/gui/image/qpixmapfilter/qpixmapfilter.pro +++ /dev/null @@ -1,14 +0,0 @@ -CONFIG += testcase -TARGET = tst_qpixmapfilter - -QT += widgets widgets-private testlib -QT += gui-private - -SOURCES += tst_qpixmapfilter.cpp - -wince*: { - addFiles.files = noise.png - addFiles.path = . - DEPLOYMENT += addFiles -} - diff --git a/tests/auto/gui/image/qpixmapfilter/tst_qpixmapfilter.cpp b/tests/auto/gui/image/qpixmapfilter/tst_qpixmapfilter.cpp deleted file mode 100644 index c9b2e054da..0000000000 --- a/tests/auto/gui/image/qpixmapfilter/tst_qpixmapfilter.cpp +++ /dev/null @@ -1,447 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include <QtTest/QtTest> -#include <qpixmap.h> -#include <private/qpixmapfilter_p.h> -#include <qpainter.h> - -class tst_QPixmapFilter : public QObject -{ - Q_OBJECT - -public: - tst_QPixmapFilter(); - virtual ~tst_QPixmapFilter(); - - -public slots: - void init(); - void cleanup(); - -private slots: - void colorizeSetColor(); - void colorizeSetStrength(); - void colorizeProcess(); - void colorizeDraw(); - void colorizeDrawStrength(); - void colorizeDrawSubRect(); - void colorizeProcessSubRect(); - void convolutionBoundingRectFor(); - void convolutionDrawSubRect(); - void dropShadowBoundingRectFor(); - void blurIndexed8(); - - void testDefaultImplementations(); -}; - -class CustomFilter : public QPixmapFilter -{ -public: - enum { Type = QPixmapFilter::UserFilter + 1 }; - - CustomFilter() : QPixmapFilter((QPixmapFilter::FilterType) Type, 0) { }; - - void draw(QPainter *p, const QPointF &pt, const QPixmap &src, const QRectF &srcRect = QRectF()) const { - p->drawPixmap(QRectF(pt, srcRect.size()), src, srcRect); - } -}; - -tst_QPixmapFilter::tst_QPixmapFilter() -{ -} - -tst_QPixmapFilter::~tst_QPixmapFilter() -{ -} - -void tst_QPixmapFilter::init() -{ -} - -void tst_QPixmapFilter::cleanup() -{ -} - -void tst_QPixmapFilter::testDefaultImplementations() -{ - CustomFilter filter; - QCOMPARE(filter.type(), (QPixmapFilter::FilterType) CustomFilter::Type); - - QCOMPARE(filter.boundingRectFor(QRectF(1, 2, 4, 8)), QRectF(1, 2, 4, 8)); - - QPixmap src(10, 10); - src.fill(Qt::blue); - - QPixmap test(src.size()); - QPainter p(&test); - filter.draw(&p, QPointF(0, 0), src, src.rect()); - p.end(); - - QCOMPARE(test.toImage().pixel(0, 0), 0xff0000ff); -} - -void tst_QPixmapFilter::colorizeSetColor() -{ - QPixmapColorizeFilter filter; - filter.setColor(QColor(50, 100, 200)); - QCOMPARE(filter.color(), QColor(50, 100, 200)); -} - -void tst_QPixmapFilter::colorizeSetStrength() -{ - QPixmapColorizeFilter filter; - QCOMPARE(filter.strength(), qreal(1)); - filter.setStrength(0.5); - QCOMPARE(filter.strength(), qreal(0.5)); - filter.setStrength(0.0); - QCOMPARE(filter.strength(), qreal(0.0)); -} - -void tst_QPixmapFilter::colorizeProcess() -{ - QPixmapColorizeFilter filter; - filter.setColor(QColor(100, 100, 100)); - - QCOMPARE(filter.boundingRectFor(QRectF(0, 0, 50, 50)), QRectF(0, 0, 50, 50)); - QCOMPARE(filter.boundingRectFor(QRectF(30, 20, 10, 40)), QRectF(30, 20, 10, 40)); - QCOMPARE(filter.boundingRectFor(QRectF(2.2, 6.3, 11.4, 47.5)), QRectF(2.2, 6.3, 11.4, 47.5)); - - QPixmap source("noise.png"); - QImage result(source.size(), QImage::Format_ARGB32_Premultiplied); - result.fill(0); - QPainter p(&result); - filter.draw(&p, QPointF(0, 0), source); - p.end(); - QImage resultImg = result; - for(int y = 0; y < resultImg.height(); y++) - { - for(int x = 0; x < resultImg.width(); x++) - { - QRgb pixel = resultImg.pixel(x,y); - QCOMPARE(qRed(pixel), qGreen(pixel)); - QCOMPARE(qGreen(pixel), qBlue(pixel)); - } - } -} - -void tst_QPixmapFilter::colorizeDraw() -{ - QPixmapColorizeFilter filter; - filter.setColor(QColor(100, 100, 100)); - - QPixmap pixmap("noise.png"); - QImage result(pixmap.size(), QImage::Format_ARGB32_Premultiplied); - QPainter painter(&result); - painter.setCompositionMode(QPainter::CompositionMode_Source); - painter.fillRect(result.rect(), QColor(128, 0, 0, 0)); - painter.setCompositionMode(QPainter::CompositionMode_SourceOver); - filter.draw(&painter, QPointF(0, 0), pixmap); - painter.end(); - - QImage resultImg = result; - for(int y = 0; y < resultImg.height(); y++) - { - for(int x = 0; x < resultImg.width(); x++) - { - QRgb pixel = resultImg.pixel(x,y); - QCOMPARE(qRed(pixel), qGreen(pixel)); - QCOMPARE(qGreen(pixel), qBlue(pixel)); - } - } -} - -void tst_QPixmapFilter::colorizeDrawStrength() -{ - QPixmapColorizeFilter filter; - filter.setColor(Qt::blue); - filter.setStrength(0.3); - - QImage source(256, 128, QImage::Format_ARGB32); - source.fill(qRgb(255, 0, 0)); - QPixmap pixmap = QPixmap::fromImage(source); - - QImage result(pixmap.size(), QImage::Format_ARGB32_Premultiplied); - QPainter painter(&result); - painter.setCompositionMode(QPainter::CompositionMode_Source); - filter.draw(&painter, QPointF(0, 0), pixmap); - painter.end(); - - QImage resultImg = result; - for(int y = 0; y < resultImg.height(); y++) - { - for(int x = 0; x < resultImg.width(); x++) - { - QRgb pixel = resultImg.pixel(x,y); - QCOMPARE(qRed(pixel), 206); - QCOMPARE(qGreen(pixel), 26); - QCOMPARE(qBlue(pixel), 75); - } - } -} - -void tst_QPixmapFilter::colorizeDrawSubRect() -{ - QPixmapColorizeFilter filter; - filter.setColor(QColor(255, 255, 255)); - - QPixmap pixmap("noise.png"); - QImage result(pixmap.size(), QImage::Format_ARGB32_Premultiplied); - QPainter painter(&result); - painter.setCompositionMode(QPainter::CompositionMode_Source); - painter.fillRect(result.rect(), QColor(128, 0, 0, 255)); - painter.setCompositionMode(QPainter::CompositionMode_SourceOver); - filter.draw(&painter, QPointF(16, 16), pixmap, QRectF(16, 16, 16, 16)); - painter.end(); - - QImage resultImg = result; - QImage sourceImg = pixmap.toImage(); - for(int y = 0; y < resultImg.height(); y++) - { - for(int x = 0; x < resultImg.width(); x++) - { - QRgb pixel = resultImg.pixel(x,y); - if(x>=16 && x<32 && y>=16 && y<32) { - QCOMPARE(qRed(pixel), qGreen(pixel)); - QCOMPARE(qGreen(pixel), qBlue(pixel)); - } else { - QCOMPARE(qRed(pixel), 128); - QCOMPARE(qGreen(pixel), 0); - QCOMPARE(qBlue(pixel), 0); - QCOMPARE(qAlpha(pixel), 255); - } - } - } -} - -void tst_QPixmapFilter::colorizeProcessSubRect() -{ - QPixmapColorizeFilter filter; - filter.setColor(QColor(200, 200, 200)); - - QPixmap source("noise.png"); - QImage result(QSize(16, 16), QImage::Format_ARGB32_Premultiplied); - result.fill(0); - QPainter p(&result); - filter.draw(&p, QPointF(0, 0), source, QRectF(16, 16, 16, 16)); - p.end(); - - QImage resultImg = result; - for(int y = 0; y < resultImg.height(); y++) - { - for(int x = 0; x < resultImg.width(); x++) - { - QRgb pixel = resultImg.pixel(x,y); - QCOMPARE(qRed(pixel), qGreen(pixel)); - QCOMPARE(qGreen(pixel), qBlue(pixel)); - } - } -} - -void tst_QPixmapFilter::convolutionBoundingRectFor() -{ - QPixmapConvolutionFilter filter; - QCOMPARE(filter.boundingRectFor(QRectF(0, 0, 50, 50)), QRectF(0, 0, 50, 50)); - QCOMPARE(filter.boundingRectFor(QRectF(30, 20, 10, 40)), QRectF(30, 20, 10, 40)); - QCOMPARE(filter.boundingRectFor(QRectF(2.2, 6.3, 11.4, 47.5)), QRectF(2.2, 6.3, 11.4, 47.5)); - qreal kernel[] = { - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0 - }; - filter.setConvolutionKernel(kernel, 2, 2); - QCOMPARE(filter.boundingRectFor(QRectF(0, 0, 50, 50)), QRectF(-1, -1, 51, 51)); - QCOMPARE(filter.boundingRectFor(QRectF(30, 20, 10, 40)), QRectF(29, 19, 11, 41)); - QCOMPARE(filter.boundingRectFor(QRectF(2.2, 6.3, 11.4, 47.5)), QRectF(1.2, 5.3, 12.4, 48.5)); - - filter.setConvolutionKernel(kernel, 3, 3); - QCOMPARE(filter.boundingRectFor(QRectF(0, 0, 50, 50)), QRectF(-1, -1, 52, 52)); - QCOMPARE(filter.boundingRectFor(QRectF(30, 20, 10, 40)), QRectF(29, 19, 12, 42)); - QCOMPARE(filter.boundingRectFor(QRectF(2.2, 6.3, 11.4, 47.5)), QRectF(1.2, 5.3, 13.4, 49.5)); - - filter.setConvolutionKernel(kernel, 4, 4); - QCOMPARE(filter.boundingRectFor(QRectF(0, 0, 50, 50)), QRectF(-2, -2, 53, 53)); - QCOMPARE(filter.boundingRectFor(QRectF(30, 20, 10, 40)), QRectF(28, 18, 13, 43)); - QCOMPARE(filter.boundingRectFor(QRectF(2.2, 6.3, 11.4, 47.5)), QRectF(0.2, 4.3, 14.4, 50.5)); -} - -void tst_QPixmapFilter::convolutionDrawSubRect() -{ - QPixmapConvolutionFilter filter; - qreal kernel[] = { - 0, 0, 0, - 0, 0, 0, - 0, 0, 1 - }; - filter.setConvolutionKernel(kernel, 3, 3); - - QPixmap pixmap("noise.png"); - QImage result(pixmap.size(), QImage::Format_ARGB32_Premultiplied); - QPainter painter(&result); - painter.setCompositionMode(QPainter::CompositionMode_Source); - painter.fillRect(result.rect(), QColor(128, 0, 0, 255)); - painter.setCompositionMode(QPainter::CompositionMode_SourceOver); - filter.draw(&painter, QPointF(16, 16), pixmap, QRectF(16, 16, 16, 16)); - painter.end(); - - QImage resultImg = result; - QImage sourceImg = pixmap.toImage(); - for(int y = 0; y < resultImg.height()-1; y++) - { - for(int x = 0; x < resultImg.width()-1; x++) - { - QRgb pixel = resultImg.pixel(x,y); - QRgb srcPixel = sourceImg.pixel(x+1,y+1); - if(x>=15 && x<33 && y>=15 && y<33) { - QCOMPARE(pixel, srcPixel); - } else { - QCOMPARE(qRed(pixel), 128); - QCOMPARE(qGreen(pixel), 0); - QCOMPARE(qBlue(pixel), 0); - QCOMPARE(qAlpha(pixel), 255); - } - } - } - - - kernel[2] = 1; - kernel[8] = 0; - filter.setConvolutionKernel(kernel, 3, 3); - - QPainter painter2(&result); - painter2.setCompositionMode(QPainter::CompositionMode_Source); - painter2.fillRect(result.rect(), QColor(128, 0, 0, 255)); - painter2.setCompositionMode(QPainter::CompositionMode_SourceOver); - filter.draw(&painter2, QPointF(16, 16), pixmap, QRectF(16, 16, 16, 16)); - painter2.end(); - - resultImg = result; - sourceImg = pixmap.toImage(); - for(int y = 1; y < resultImg.height(); y++) - { - for(int x = 0; x < resultImg.width()-1; x++) - { - QRgb pixel = resultImg.pixel(x,y); - QRgb srcPixel = sourceImg.pixel(x+1,y-1); - if(x>=15 && x<33 && y>=15 && y<33) { - QCOMPARE(pixel, srcPixel); - } else { - QCOMPARE(qRed(pixel), 128); - QCOMPARE(qGreen(pixel), 0); - QCOMPARE(qBlue(pixel), 0); - QCOMPARE(qAlpha(pixel), 255); - } - } - } - -} - -void tst_QPixmapFilter::dropShadowBoundingRectFor() -{ - QPixmapDropShadowFilter filter; - filter.setBlurRadius(0); - - QCOMPARE(filter.blurRadius(), 0.); - - const QRectF rect1(0, 0, 50, 50); - const QRectF rect2(30, 20, 10, 40); - const QRectF rect3(2.2, 6.3, 11.4, 47.5); - - filter.setOffset(QPointF(0,0)); - QCOMPARE(filter.boundingRectFor(rect1), rect1); - QCOMPARE(filter.boundingRectFor(rect2), rect2); - QCOMPARE(filter.boundingRectFor(rect3), rect3); - - filter.setOffset(QPointF(1,1)); - QCOMPARE(filter.offset(), QPointF(1, 1)); - QCOMPARE(filter.boundingRectFor(rect1), rect1.adjusted(0, 0, 1, 1)); - QCOMPARE(filter.boundingRectFor(rect2), rect2.adjusted(0, 0, 1, 1)); - QCOMPARE(filter.boundingRectFor(rect3), rect3.adjusted(0, 0, 1, 1)); - - filter.setOffset(QPointF(-1,-1)); - QCOMPARE(filter.boundingRectFor(rect1), rect1.adjusted(-1, -1, 0, 0)); - QCOMPARE(filter.boundingRectFor(rect2), rect2.adjusted(-1, -1, 0, 0)); - QCOMPARE(filter.boundingRectFor(rect3), rect3.adjusted(-1, -1, 0, 0)); - - filter.setBlurRadius(2); - filter.setOffset(QPointF(0,0)); - qreal delta = 2; - QCOMPARE(filter.boundingRectFor(rect1), rect1.adjusted(-delta, -delta, delta, delta)); - QCOMPARE(filter.boundingRectFor(rect2), rect2.adjusted(-delta, -delta, delta, delta)); - QCOMPARE(filter.boundingRectFor(rect3), rect3.adjusted(-delta, -delta, delta, delta)); - - filter.setOffset(QPointF(1,1)); - QCOMPARE(filter.boundingRectFor(rect1), rect1.adjusted(-delta + 1, -delta + 1, delta + 1, delta + 1)); - QCOMPARE(filter.boundingRectFor(rect2), rect2.adjusted(-delta + 1, -delta + 1, delta + 1, delta + 1)); - QCOMPARE(filter.boundingRectFor(rect3), rect3.adjusted(-delta + 1, -delta + 1, delta + 1, delta + 1)); - - filter.setOffset(QPointF(-10,-10)); - QCOMPARE(filter.boundingRectFor(rect1), rect1.adjusted(-delta - 10, -delta - 10, 0, 0)); - QCOMPARE(filter.boundingRectFor(rect2), rect2.adjusted(-delta - 10, -delta - 10, 0, 0)); - QCOMPARE(filter.boundingRectFor(rect3), rect3.adjusted(-delta - 10, -delta - 10, 0, 0)); -} - -QT_BEGIN_NAMESPACE -void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed); -QT_END_NAMESPACE - -void tst_QPixmapFilter::blurIndexed8() -{ - QImage img(16, 32, QImage::Format_Indexed8); - img.setColorCount(256); - for (int i = 0; i < 256; ++i) - img.setColor(i, qRgb(i, i, i)); - - img.fill(255); - - QImage original = img; - qt_blurImage(img, 10, true, false); - QCOMPARE(original.size(), img.size()); - - original = img; - qt_blurImage(img, 10, true, true); - QCOMPARE(original.size(), QSize(img.height(), img.width())); -} - -QTEST_MAIN(tst_QPixmapFilter) -#include "tst_qpixmapfilter.moc" diff --git a/tests/auto/gui/kernel/qdrag/qdrag.pro b/tests/auto/gui/kernel/qdrag/qdrag.pro index 0173b57215..ac3fde8028 100644 --- a/tests/auto/gui/kernel/qdrag/qdrag.pro +++ b/tests/auto/gui/kernel/qdrag/qdrag.pro @@ -4,7 +4,7 @@ CONFIG += testcase TARGET = tst_qdrag -QT += widgets testlib +QT += testlib SOURCES += tst_qdrag.cpp diff --git a/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.cpp b/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.cpp index 9d138f6a2e..a9f9c8db08 100644 --- a/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.cpp +++ b/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.cpp @@ -40,13 +40,12 @@ ****************************************************************************/ #include <QtGui> -#include <QApplication> #include <QEvent> -struct MyApplication : public QApplication +struct MyApplication : public QGuiApplication { MyApplication(int& argc, char** argv) - : QApplication(argc, argv) + : QGuiApplication(argc, argv) {} bool event(QEvent * event) @@ -59,7 +58,7 @@ struct MyApplication : public QApplication file.write(QByteArray("+external")); return true; } else { - return QApplication::event(event); + return QGuiApplication::event(event); } } }; diff --git a/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.pro b/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.pro index 7de7b2ec57..b84ff760ca 100644 --- a/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.pro +++ b/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.pro @@ -1,4 +1,4 @@ TEMPLATE = app TARGET = qfileopeneventexternal -QT += core gui widgets +QT += core gui SOURCES += qfileopeneventexternal.cpp diff --git a/tests/auto/gui/kernel/qkeysequence/qkeysequence.pro b/tests/auto/gui/kernel/qkeysequence/qkeysequence.pro index cf4337b156..9f79fe9ab7 100644 --- a/tests/auto/gui/kernel/qkeysequence/qkeysequence.pro +++ b/tests/auto/gui/kernel/qkeysequence/qkeysequence.pro @@ -1,7 +1,7 @@ CONFIG += testcase TARGET = tst_qkeysequence -QT += widgets testlib +QT += testlib QT += core-private gui-private SOURCES += tst_qkeysequence.cpp diff --git a/tests/auto/gui/kernel/qmouseevent/qmouseevent.pro b/tests/auto/gui/kernel/qmouseevent/qmouseevent.pro index b99c3016b0..5fa886334a 100644 --- a/tests/auto/gui/kernel/qmouseevent/qmouseevent.pro +++ b/tests/auto/gui/kernel/qmouseevent/qmouseevent.pro @@ -1,4 +1,4 @@ CONFIG += testcase TARGET = tst_qmouseevent -QT += widgets testlib +QT += testlib SOURCES += tst_qmouseevent.cpp diff --git a/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp b/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp index d8f1f0640e..012502469b 100644 --- a/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp +++ b/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp @@ -41,21 +41,14 @@ #include <QtTest/QtTest> -#include <qapplication.h> -#include <qlineedit.h> -#include <qlabel.h> -#include <qdialog.h> - - #include <qevent.h> -#include <qwidget.h> +#include <qwindow.h> -class MouseEventWidget : public QWidget +class MouseEventWidget : public QWindow { public: - MouseEventWidget(QWidget *parent = 0) : QWidget(parent) + MouseEventWidget(QWindow *parent = 0) : QWindow(parent) { - setFocusPolicy(Qt::StrongFocus); } bool mousePressEventRecieved; bool mouseReleaseEventRecieved; @@ -68,7 +61,7 @@ public: protected: void mousePressEvent(QMouseEvent *e) { - QWidget::mousePressEvent(e); + QWindow::mousePressEvent(e); mousePressButton = e->button(); mousePressButtons = e->buttons(); mousePressModifiers = e->modifiers(); @@ -77,7 +70,7 @@ protected: } void mouseReleaseEvent(QMouseEvent *e) { - QWidget::mouseReleaseEvent(e); + QWindow::mouseReleaseEvent(e); mouseReleaseButton = e->button(); mouseReleaseButtons = e->buttons(); mouseReleaseModifiers = e->modifiers(); @@ -179,12 +172,14 @@ void tst_QMouseEvent::checkMousePressEvent() int modifiers = keyPressed; QTest::mousePress(testMouseWidget, Qt::MouseButton(buttonPressed), Qt::KeyboardModifiers(keyPressed)); + qApp->processEvents(); QVERIFY(testMouseWidget->mousePressEventRecieved); QCOMPARE(testMouseWidget->mousePressButton, button); QCOMPARE(testMouseWidget->mousePressButtons, buttons); QCOMPARE(testMouseWidget->mousePressModifiers, modifiers); QTest::mouseRelease(testMouseWidget, Qt::MouseButton(buttonPressed), Qt::KeyboardModifiers(keyPressed)); + qApp->processEvents(); } void tst_QMouseEvent::checkMouseReleaseEvent_data() @@ -218,6 +213,7 @@ void tst_QMouseEvent::checkMouseReleaseEvent() int modifiers = keyPressed; QTest::mouseClick(testMouseWidget, Qt::MouseButton(buttonReleased), Qt::KeyboardModifiers(keyPressed)); + qApp->processEvents(); QVERIFY(testMouseWidget->mouseReleaseEventRecieved); QCOMPARE(testMouseWidget->mouseReleaseButton, button); QCOMPARE(testMouseWidget->mouseReleaseButtons, buttons); diff --git a/tests/auto/gui/kernel/qpalette/qpalette.pro b/tests/auto/gui/kernel/qpalette/qpalette.pro index 8975704f0f..9dd3f3e715 100644 --- a/tests/auto/gui/kernel/qpalette/qpalette.pro +++ b/tests/auto/gui/kernel/qpalette/qpalette.pro @@ -1,6 +1,6 @@ CONFIG += testcase TARGET = tst_qpalette -QT += widgets testlib +QT += testlib SOURCES += tst_qpalette.cpp diff --git a/tests/auto/gui/kernel/qpalette/tst_qpalette.cpp b/tests/auto/gui/kernel/qpalette/tst_qpalette.cpp index cc46831965..dc393fc2c3 100644 --- a/tests/auto/gui/kernel/qpalette/tst_qpalette.cpp +++ b/tests/auto/gui/kernel/qpalette/tst_qpalette.cpp @@ -43,7 +43,6 @@ #include <QtTest/QtTest> #include "qpalette.h" -#include <qapplication.h> class tst_QPalette : public QObject { diff --git a/tests/auto/gui/painting/painting.pro b/tests/auto/gui/painting/painting.pro index 62230eeac7..8f018fd921 100644 --- a/tests/auto/gui/painting/painting.pro +++ b/tests/auto/gui/painting/painting.pro @@ -7,12 +7,10 @@ SUBDIRS=\ qregion \ qpainter \ qpathclipper \ - qprinterinfo \ qpen \ qpaintengine \ qtransform \ qwmatrix \ - qprinter \ qpolygon \ !contains(QT_CONFIG, private_tests): SUBDIRS -= \ diff --git a/tests/auto/gui/painting/qbrush/qbrush.pro b/tests/auto/gui/painting/qbrush/qbrush.pro index 2a470c4db1..3ef9b36ef5 100644 --- a/tests/auto/gui/painting/qbrush/qbrush.pro +++ b/tests/auto/gui/painting/qbrush/qbrush.pro @@ -1,4 +1,4 @@ CONFIG += testcase TARGET = tst_qbrush -QT += widgets testlib +QT += testlib SOURCES += tst_qbrush.cpp diff --git a/tests/auto/gui/painting/qpolygon/qpolygon.pro b/tests/auto/gui/painting/qpolygon/qpolygon.pro index 869fbd30c5..804fc0dfd2 100644 --- a/tests/auto/gui/painting/qpolygon/qpolygon.pro +++ b/tests/auto/gui/painting/qpolygon/qpolygon.pro @@ -1,6 +1,6 @@ CONFIG += testcase TARGET = tst_qpolygon -QT += widgets testlib +QT += testlib SOURCES += tst_qpolygon.cpp unix:!mac:LIBS+=-lm diff --git a/tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp b/tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp index 5e5f661a09..f9dbbbf219 100644 --- a/tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp +++ b/tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp @@ -47,7 +47,6 @@ #include <math.h> #include <qpainter.h> -#include <qdialog.h> class tst_QPolygon : public QObject { diff --git a/tests/auto/gui/painting/qprinter/.gitignore b/tests/auto/gui/painting/qprinter/.gitignore deleted file mode 100644 index 85de0e9675..0000000000 --- a/tests/auto/gui/painting/qprinter/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -tqpluginloader/st_qprinter -silly -test.pdf - diff --git a/tests/auto/gui/painting/qprinter/qprinter.pro b/tests/auto/gui/painting/qprinter/qprinter.pro deleted file mode 100644 index 7543e91f8c..0000000000 --- a/tests/auto/gui/painting/qprinter/qprinter.pro +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG += testcase -TARGET = tst_qprinter -QT += printsupport widgets testlib -SOURCES += tst_qprinter.cpp - -mac*:CONFIG+=insignificant_test -win32:CONFIG += insignificant_test # QTBUG-24191 diff --git a/tests/auto/gui/painting/qprinter/tst_qprinter.cpp b/tests/auto/gui/painting/qprinter/tst_qprinter.cpp deleted file mode 100644 index 3460ad702b..0000000000 --- a/tests/auto/gui/painting/qprinter/tst_qprinter.cpp +++ /dev/null @@ -1,1023 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <QtTest/QtTest> - -#include <qprinter.h> -#include <qpagesetupdialog.h> -#include <qpainter.h> -#include <qprintdialog.h> -#include <qprinterinfo.h> -#include <qvariant.h> -#include <qpainter.h> -#include <qprintengine.h> - -#include <math.h> - -#ifdef Q_OS_WIN -#include <windows.h> -#endif - -Q_DECLARE_METATYPE(QRect) - -QT_FORWARD_DECLARE_CLASS(QPrinter) - -// Helper class to make sure temp files are cleaned up after test complete -class TempFileCleanup -{ -public: - TempFileCleanup(const QString &file) - : m_file(file) - { - } - - ~TempFileCleanup() - { - QFile::remove(m_file); - } -private: - QString m_file; -}; - -class tst_QPrinter : public QObject -{ - Q_OBJECT - -#ifdef QT_NO_PRINTER -public slots: - void initTestCase(); -#else -private slots: - void getSetCheck(); -// Add your testfunctions and testdata create functions here - void testPageSize(); - void testPageRectAndPaperRect(); - void testPageRectAndPaperRect_data(); - void testSetOptions(); - void testMargins_data(); - void testMargins(); - void testNonExistentPrinter(); - void testPageSetupDialog(); - void testMulitpleSets_data(); - void testMulitpleSets(); - void testPageMargins_data(); - void testPageMargins(); - void changingOutputFormat(); - void outputFormatFromSuffix(); - void setGetPaperSize(); - void valuePreservation(); - void errorReporting(); - void testCustomPageSizes(); -#if !defined(QT_NO_COMPLETER) && !defined(QT_NO_FILEDIALOG) - void printDialogCompleter(); -#endif - - void testCopyCount(); - void testCurrentPage(); - - void taskQTBUG4497_reusePrinterOnDifferentFiles(); - void testPdfTitle(); -#endif -}; - -#ifdef QT_NO_PRINTER -void tst_QPrinter::initTestCase() -{ - QSKIP("This test requires printing support"); -} - -#else - -// Testing get/set functions -void tst_QPrinter::getSetCheck() -{ - QPrinter obj1; - // OutputFormat QPrinter::outputFormat() - // void QPrinter::setOutputFormat(OutputFormat) - obj1.setOutputFormat(QPrinter::OutputFormat(QPrinter::PdfFormat)); - QCOMPARE(QPrinter::OutputFormat(QPrinter::PdfFormat), obj1.outputFormat()); - - // bool QPrinter::collateCopies() - // void QPrinter::setCollateCopies(bool) - obj1.setCollateCopies(false); - QCOMPARE(false, obj1.collateCopies()); - obj1.setCollateCopies(true); - QCOMPARE(true, obj1.collateCopies()); - - obj1.setColorMode(QPrinter::GrayScale); - QCOMPARE(obj1.colorMode(), QPrinter::GrayScale); - obj1.setColorMode(QPrinter::Color); - QCOMPARE(obj1.colorMode(), QPrinter::Color); - - obj1.setCreator(QString::fromLatin1("RandomQtUser")); - QCOMPARE(obj1.creator(), QString::fromLatin1("RandomQtUser")); - - obj1.setDocName(QString::fromLatin1("RandomQtDocument")); - QCOMPARE(obj1.docName(), QString::fromLatin1("RandomQtDocument")); - - obj1.setDoubleSidedPrinting(true); - QCOMPARE(obj1.doubleSidedPrinting(), true); - obj1.setDoubleSidedPrinting(false); - QCOMPARE(obj1.doubleSidedPrinting(), false); - - obj1.setFromTo(1, 4); - QCOMPARE(obj1.fromPage(), 1); - QCOMPARE(obj1.toPage(), 4); - - obj1.setFullPage(true); - QCOMPARE(obj1.fullPage(), true); - obj1.setFullPage(false); - QCOMPARE(obj1.fullPage(), false); - - obj1.setOrientation(QPrinter::Landscape); - QCOMPARE(obj1.orientation(), QPrinter::Landscape); - obj1.setOrientation(QPrinter::Portrait); - QCOMPARE(obj1.orientation(), QPrinter::Portrait); - - obj1.setOutputFileName(QString::fromLatin1("RandomQtName")); - QCOMPARE(obj1.outputFileName(), QString::fromLatin1("RandomQtName")); - - obj1.setPageOrder(QPrinter::FirstPageFirst); - QCOMPARE(obj1.pageOrder(), QPrinter::FirstPageFirst); - obj1.setPageOrder(QPrinter::LastPageFirst); - QCOMPARE(obj1.pageOrder(), QPrinter::LastPageFirst); - - obj1.setPaperSource(QPrinter::Cassette); - QCOMPARE(obj1.paperSource(), QPrinter::Cassette); - obj1.setPaperSource(QPrinter::Middle); - QCOMPARE(obj1.paperSource(), QPrinter::Middle); - -#ifdef Q_OS_UNIX - obj1.setPrintProgram(QString::fromLatin1("/bin/true")); - QCOMPARE(obj1.printProgram(), QString::fromLatin1("/bin/true")); - - obj1.setPrinterSelectionOption(QString::fromLatin1("--option")); - QCOMPARE(obj1.printerSelectionOption(), QString::fromLatin1("--option")); -#endif - - obj1.setPrinterName(QString::fromLatin1("myPrinter")); - QCOMPARE(obj1.printerName(), QString::fromLatin1("myPrinter")); - - // bool QPrinter::fontEmbeddingEnabled() - // void QPrinter::setFontEmbeddingEnabled(bool) - obj1.setFontEmbeddingEnabled(false); - QCOMPARE(false, obj1.fontEmbeddingEnabled()); - obj1.setFontEmbeddingEnabled(true); - QCOMPARE(true, obj1.fontEmbeddingEnabled()); - - // PageSize QPrinter::pageSize() - // void QPrinter::setPageSize(PageSize) - obj1.setPageSize(QPrinter::PageSize(QPrinter::A4)); - QCOMPARE(QPrinter::PageSize(QPrinter::A4), obj1.pageSize()); - obj1.setPageSize(QPrinter::PageSize(QPrinter::Letter)); - QCOMPARE(QPrinter::PageSize(QPrinter::Letter), obj1.pageSize()); - obj1.setPageSize(QPrinter::PageSize(QPrinter::Legal)); - QCOMPARE(QPrinter::PageSize(QPrinter::Legal), obj1.pageSize()); - - // PrintRange QPrinter::printRange() - // void QPrinter::setPrintRange(PrintRange) - obj1.setPrintRange(QPrinter::PrintRange(QPrinter::AllPages)); - QCOMPARE(QPrinter::PrintRange(QPrinter::AllPages), obj1.printRange()); - obj1.setPrintRange(QPrinter::PrintRange(QPrinter::Selection)); - QCOMPARE(QPrinter::PrintRange(QPrinter::Selection), obj1.printRange()); - obj1.setPrintRange(QPrinter::PrintRange(QPrinter::PageRange)); - QCOMPARE(QPrinter::PrintRange(QPrinter::PageRange), obj1.printRange()); -} - -#define MYCOMPARE(a, b) QCOMPARE(QVariant((int)a), QVariant((int)b)) - -void tst_QPrinter::testPageSetupDialog() -{ - // Make sure this doesn't crash at least - { - QPrinter printer; - QPageSetupDialog dialog(&printer); - } -} - -void tst_QPrinter::testPageSize() -{ -#if 1 - QSKIP("QPrinter::winPageSize(): Windows only and currently not implemented / QTBUG-22927"); -#else - QPrinter prn; - - prn.setPageSize(QPrinter::Letter); - MYCOMPARE(prn.pageSize(), QPrinter::Letter); - MYCOMPARE(prn.winPageSize(), DMPAPER_LETTER); - - prn.setPageSize(QPrinter::A4); - MYCOMPARE(prn.pageSize(), QPrinter::A4); - MYCOMPARE(prn.winPageSize(), DMPAPER_A4); - - prn.setWinPageSize(DMPAPER_LETTER); - MYCOMPARE(prn.winPageSize(), DMPAPER_LETTER); - MYCOMPARE(prn.pageSize(), QPrinter::Letter); - - prn.setWinPageSize(DMPAPER_A4); - MYCOMPARE(prn.winPageSize(), DMPAPER_A4); - MYCOMPARE(prn.pageSize(), QPrinter::A4); -#endif -} - -void tst_QPrinter::testPageRectAndPaperRect_data() -{ - QTest::addColumn<int>("orientation"); - QTest::addColumn<bool>("withPainter"); - QTest::addColumn<int>("resolution"); - QTest::addColumn<bool>("doPaperRect"); - - // paperrect - QTest::newRow("paperRect0") << int(QPrinter::Portrait) << true << 300 << true; - QTest::newRow("paperRect1") << int(QPrinter::Portrait) << false << 300 << true; - QTest::newRow("paperRect2") << int(QPrinter::Landscape) << true << 300 << true; - QTest::newRow("paperRect3") << int(QPrinter::Landscape) << false << 300 << true; - QTest::newRow("paperRect4") << int(QPrinter::Portrait) << true << 600 << true; - QTest::newRow("paperRect5") << int(QPrinter::Portrait) << false << 600 << true; - QTest::newRow("paperRect6") << int(QPrinter::Landscape) << true << 600 << true; - QTest::newRow("paperRect7") << int(QPrinter::Landscape) << false << 600 << true; - QTest::newRow("paperRect8") << int(QPrinter::Portrait) << true << 1200 << true; - QTest::newRow("paperRect9") << int(QPrinter::Portrait) << false << 1200 << true; - QTest::newRow("paperRect10") << int(QPrinter::Landscape) << true << 1200 << true; - QTest::newRow("paperRect11") << int(QPrinter::Landscape) << false << 1200 << true; - - // page rect - QTest::newRow("pageRect0") << int(QPrinter::Portrait) << true << 300 << false; - QTest::newRow("pageRect1") << int(QPrinter::Portrait) << false << 300 << false; - QTest::newRow("pageRect2") << int(QPrinter::Landscape) << true << 300 << false; - QTest::newRow("pageRect3") << int(QPrinter::Landscape) << false << 300 << false; - QTest::newRow("pageRect4") << int(QPrinter::Portrait) << true << 600 << false; - QTest::newRow("pageRect5") << int(QPrinter::Portrait) << false << 600 << false; - QTest::newRow("pageRect6") << int(QPrinter::Landscape) << true << 600 << false; - QTest::newRow("pageRect7") << int(QPrinter::Landscape) << false << 600 << false; - QTest::newRow("pageRect8") << int(QPrinter::Portrait) << true << 1200 << false; - QTest::newRow("pageRect9") << int(QPrinter::Portrait) << false << 1200 << false; - QTest::newRow("pageRect10") << int(QPrinter::Landscape) << true << 1200 << false; - QTest::newRow("pageRect11") << int(QPrinter::Landscape) << false << 1200 << false; -} - -void tst_QPrinter::testPageRectAndPaperRect() -{ - QFETCH(bool, withPainter); - QFETCH(int, orientation); - QFETCH(int, resolution); - QFETCH(bool, doPaperRect); - - QPainter *painter = 0; - QPrinter printer(QPrinter::HighResolution); - printer.setOrientation(QPrinter::Orientation(orientation)); - printer.setOutputFileName("silly"); - TempFileCleanup tmpFile("silly"); - - QRect pageRect = doPaperRect ? printer.paperRect() : printer.pageRect(); - float inchesX = float(pageRect.width()) / float(printer.resolution()); - float inchesY = float(pageRect.height()) / float(printer.resolution()); - printer.setResolution(resolution); - if (withPainter) - painter = new QPainter(&printer); - - QRect otherRect = doPaperRect ? printer.paperRect() : printer.pageRect(); - float otherInchesX = float(otherRect.width()) / float(printer.resolution()); - float otherInchesY = float(otherRect.height()) / float(printer.resolution()); - if (painter != 0) - delete painter; - - QVERIFY(qAbs(otherInchesX - inchesX) < 0.01); - QVERIFY(qAbs(otherInchesY - inchesY) < 0.01); - - QVERIFY(printer.orientation() == QPrinter::Portrait || pageRect.width() > pageRect.height()); - QVERIFY(printer.orientation() != QPrinter::Portrait || pageRect.width() < pageRect.height()); -} - -void tst_QPrinter::testSetOptions() -{ - QPrinter prn; - QPrintDialog dlg(&prn); - - // Verify default values - MYCOMPARE(dlg.isOptionEnabled(QAbstractPrintDialog::PrintToFile), true); - MYCOMPARE(dlg.isOptionEnabled(QAbstractPrintDialog::PrintSelection), false); - MYCOMPARE(dlg.isOptionEnabled(QAbstractPrintDialog::PrintPageRange), true); - - dlg.setEnabledOptions(QAbstractPrintDialog::PrintPageRange); - MYCOMPARE(dlg.isOptionEnabled(QAbstractPrintDialog::PrintToFile), false); - MYCOMPARE(dlg.isOptionEnabled(QAbstractPrintDialog::PrintSelection), false); - MYCOMPARE(dlg.isOptionEnabled(QAbstractPrintDialog::PrintPageRange), true); - - dlg.setEnabledOptions((QAbstractPrintDialog::PrintDialogOptions(QAbstractPrintDialog::PrintSelection - | QAbstractPrintDialog::PrintPageRange))); - MYCOMPARE(dlg.isOptionEnabled(QAbstractPrintDialog::PrintToFile), false); - MYCOMPARE(dlg.isOptionEnabled(QAbstractPrintDialog::PrintSelection), true); - MYCOMPARE(dlg.isOptionEnabled(QAbstractPrintDialog::PrintPageRange), true); - - dlg.setEnabledOptions(QAbstractPrintDialog::PrintSelection); - MYCOMPARE(dlg.isOptionEnabled(QAbstractPrintDialog::PrintToFile), false); - MYCOMPARE(dlg.isOptionEnabled(QAbstractPrintDialog::PrintSelection), true); - MYCOMPARE(dlg.isOptionEnabled(QAbstractPrintDialog::PrintPageRange), false); -} - -void tst_QPrinter::testMargins_data() -{ - QTest::addColumn<int>("orientation"); - QTest::addColumn<bool>("fullpage"); - QTest::addColumn<int>("pagesize"); - QTest::addColumn<int>("width"); - QTest::addColumn<int>("height"); - QTest::addColumn<bool>("withPainter"); - - QTest::newRow("data0") << int(QPrinter::Portrait) << true << int(QPrinter::A4) << 210 << 297 << false; - QTest::newRow("data1") << int(QPrinter::Landscape) << true << int(QPrinter::A4) << 297 << 210 << false; - QTest::newRow("data2") << int(QPrinter::Landscape) << false << int(QPrinter::A4) << 297 << 210 << false; - QTest::newRow("data3") << int(QPrinter::Portrait) << false << int(QPrinter::A4) << 210 << 297 << false; - QTest::newRow("data4") << int(QPrinter::Portrait) << true << int(QPrinter::A4) << 210 << 297 << true; - QTest::newRow("data5") << int(QPrinter::Landscape) << true << int(QPrinter::A4) << 297 << 210 << true; - QTest::newRow("data6") << int(QPrinter::Landscape) << false << int(QPrinter::A4) << 297 << 210 << true; - QTest::newRow("data7") << int(QPrinter::Portrait) << false << int(QPrinter::A4) << 210 << 297 << true; -} - -void tst_QPrinter::testMargins() -{ - QFETCH(bool, withPainter); - QFETCH(int, orientation); - QFETCH(int, pagesize); - QFETCH(int, width); - QFETCH(int, height); - QFETCH(bool, fullpage); - Q_UNUSED(width); - Q_UNUSED(height); - QPrinter printer; - QPainter *painter = 0; - printer.setOutputFileName("silly"); - printer.setOrientation((QPrinter::Orientation)orientation); - printer.setFullPage(fullpage); - printer.setPageSize((QPrinter::PageSize)pagesize); - if (withPainter) - painter = new QPainter(&printer); - - if (painter) - delete painter; - QFile::remove("silly"); -} - -void tst_QPrinter::testNonExistentPrinter() -{ -#ifndef Q_OS_WIN - QSKIP("QPrinter::testNonExistentPrinter() is not relevant for this platform"); -#else - QPrinter printer; - QPainter painter; - - // Make sure it doesn't crash on setting or getting properties - printer.setPrinterName("some non existing printer"); - printer.setPageSize(QPrinter::A4); - printer.setOrientation(QPrinter::Portrait); - printer.setFullPage(true); - printer.pageSize(); - printer.orientation(); - printer.fullPage(); - printer.setCopyCount(1); - printer.printerName(); - - // nor metrics - QCOMPARE(printer.printEngine()->metric(QPaintDevice::PdmWidth), 0); - QCOMPARE(printer.printEngine()->metric(QPaintDevice::PdmHeight), 0); - QCOMPARE(printer.printEngine()->metric(QPaintDevice::PdmWidthMM), 0); - QCOMPARE(printer.printEngine()->metric(QPaintDevice::PdmHeightMM), 0); - QCOMPARE(printer.printEngine()->metric(QPaintDevice::PdmNumColors), 0); - QCOMPARE(printer.printEngine()->metric(QPaintDevice::PdmDepth), 0); - QCOMPARE(printer.printEngine()->metric(QPaintDevice::PdmDpiX), 0); - QCOMPARE(printer.printEngine()->metric(QPaintDevice::PdmDpiY), 0); - QCOMPARE(printer.printEngine()->metric(QPaintDevice::PdmPhysicalDpiX), 0); - QCOMPARE(printer.printEngine()->metric(QPaintDevice::PdmPhysicalDpiY), 0); - - QVERIFY(!painter.begin(&printer)); -#endif -} - -void tst_QPrinter::testMulitpleSets_data() -{ - QTest::addColumn<int>("resolution"); - QTest::addColumn<int>("pageSize"); - QTest::addColumn<int>("widthMMAfter"); - QTest::addColumn<int>("heightMMAfter"); - - - QTest::newRow("lowRes") << int(QPrinter::ScreenResolution) << int(QPrinter::A4) << 210 << 297; - QTest::newRow("lowResLetter") << int(QPrinter::ScreenResolution) << int(QPrinter::Letter) << 216 << 279; - QTest::newRow("lowResA5") << int(QPrinter::ScreenResolution) << int(QPrinter::A5) << 148 << 210; - QTest::newRow("midRes") << int(QPrinter::PrinterResolution) << int(QPrinter::A4) << 210 << 297; - QTest::newRow("midResLetter") << int(QPrinter::PrinterResolution) << int(QPrinter::Letter) << 216 << 279; - QTest::newRow("midResA5") << int(QPrinter::PrinterResolution) << int(QPrinter::A5) << 148 << 210; - QTest::newRow("highRes") << int(QPrinter::HighResolution) << int(QPrinter::A4) << 210 << 297; - QTest::newRow("highResLetter") << int(QPrinter::HighResolution) << int(QPrinter::Letter) << 216 << 279; - QTest::newRow("highResA5") << int(QPrinter::HighResolution) << int(QPrinter::A5) << 148 << 210; -} - -static void computePageValue(const QPrinter &printer, int &retWidth, int &retHeight) -{ - const double Inch2MM = 25.4; - - double width = double(printer.paperRect().width()) / printer.logicalDpiX() * Inch2MM; - double height = double(printer.paperRect().height()) / printer.logicalDpiY() * Inch2MM; - retWidth = qRound(width); - retHeight = qRound(height); -} - -void tst_QPrinter::testMulitpleSets() -{ - // A very simple test, but Mac needs to have its format "validated" if the format is changed - // This takes care of that. - QFETCH(int, resolution); - QFETCH(int, pageSize); - QFETCH(int, widthMMAfter); - QFETCH(int, heightMMAfter); - - - QPrinter::PrinterMode mode = QPrinter::PrinterMode(resolution); - QPrinter::PageSize printerPageSize = QPrinter::PageSize(pageSize); - QPrinter printer(mode); - printer.setFullPage(true); - - int paperWidth, paperHeight; - //const int Tolerance = 2; - - computePageValue(printer, paperWidth, paperHeight); - printer.setPageSize(printerPageSize); - - if (printer.pageSize() != printerPageSize) { - QSKIP("Current page size is not supported on this printer"); - return; - } - - QCOMPARE(printer.widthMM(), widthMMAfter); - QCOMPARE(printer.heightMM(), heightMMAfter); - - computePageValue(printer, paperWidth, paperHeight); - - QVERIFY(qAbs(paperWidth - widthMMAfter) <= 2); - QVERIFY(qAbs(paperHeight - heightMMAfter) <= 2); - - // Set it again and see if it still works. - printer.setPageSize(printerPageSize); - QCOMPARE(printer.widthMM(), widthMMAfter); - QCOMPARE(printer.heightMM(), heightMMAfter); - - printer.setOrientation(QPrinter::Landscape); - computePageValue(printer, paperWidth, paperHeight); - QVERIFY(qAbs(paperWidth - heightMMAfter) <= 2); - QVERIFY(qAbs(paperHeight - widthMMAfter) <= 2); -} - -void tst_QPrinter::changingOutputFormat() -{ -#if QT_VERSION < 0x050000 - QPrinter p; - p.setOutputFormat(QPrinter::PostScriptFormat); - p.setPageSize(QPrinter::A8); - p.setOutputFormat(QPrinter::PdfFormat); - QCOMPARE(p.pageSize(), QPrinter::A8); -#endif -} - -void tst_QPrinter::outputFormatFromSuffix() -{ - if (QPrinterInfo::availablePrinters().size() == 0) - QSKIP("No printers available."); - QPrinter p; - QVERIFY(p.outputFormat() == QPrinter::NativeFormat); - p.setOutputFileName("test.pdf"); - TempFileCleanup tmpFile("test.pdf"); - QVERIFY(p.outputFormat() == QPrinter::PdfFormat); - p.setOutputFileName(QString()); - QVERIFY(p.outputFormat() == QPrinter::NativeFormat); -} - -void tst_QPrinter::setGetPaperSize() -{ - QPrinter p; - p.setOutputFormat(QPrinter::PdfFormat); - QSizeF size(500, 10); - p.setPaperSize(size, QPrinter::Millimeter); - QCOMPARE(p.paperSize(QPrinter::Millimeter), size); - QSizeF ptSize = p.paperSize(QPrinter::Point); - //qDebug() << ptSize; - QVERIFY(qAbs(ptSize.width() - size.width() * (72/25.4)) < 1E-4); - QVERIFY(qAbs(ptSize.height() - size.height() * (72/25.4)) < 1E-4); -} - -void tst_QPrinter::testPageMargins_data() -{ - QTest::addColumn<qreal>("left"); - QTest::addColumn<qreal>("top"); - QTest::addColumn<qreal>("right"); - QTest::addColumn<qreal>("bottom"); - QTest::addColumn<int>("unit"); - - QTest::newRow("data0") << qreal(5.5) << qreal(6.5) << qreal(7.5) << qreal(8.5) << static_cast<int>(QPrinter::Millimeter); - QTest::newRow("data1") << qreal(5.5) << qreal(6.5) << qreal(7.5) << qreal(8.5) << static_cast<int>(QPrinter::Point); - QTest::newRow("data2") << qreal(5.5) << qreal(6.5) << qreal(7.5) << qreal(8.5) << static_cast<int>(QPrinter::Inch); - QTest::newRow("data3") << qreal(5.5) << qreal(6.5) << qreal(7.5) << qreal(8.5) << static_cast<int>(QPrinter::Pica); - QTest::newRow("data4") << qreal(5.5) << qreal(6.5) << qreal(7.5) << qreal(8.5) << static_cast<int>(QPrinter::Didot); - QTest::newRow("data5") << qreal(5.5) << qreal(6.5) << qreal(7.5) << qreal(8.5) << static_cast<int>(QPrinter::Cicero); -} - -void tst_QPrinter::testPageMargins() -{ - QPrinter obj1; - - qreal toMillimeters[6]; - toMillimeters[QPrinter::Millimeter] = 1; - toMillimeters[QPrinter::Point] = 0.352777778; - toMillimeters[QPrinter::Inch] = 25.4; - toMillimeters[QPrinter::Pica] = 4.23333333; - toMillimeters[QPrinter::Didot] = 0.376; - toMillimeters[QPrinter::Cicero] = 4.51166667; - - QFETCH(qreal, left); - QFETCH(qreal, top); - QFETCH(qreal, right); - QFETCH(qreal, bottom); - QFETCH(int, unit); - - qreal nLeft, nTop, nRight, nBottom; - - obj1.setPageMargins(left, top, right, bottom, static_cast<QPrinter::Unit>(unit)); - - qreal tolerance = 0.05; - - obj1.getPageMargins(&nLeft, &nTop, &nRight, &nBottom, QPrinter::Millimeter); - QVERIFY(fabs(left*toMillimeters[unit] - nLeft*toMillimeters[QPrinter::Millimeter]) < tolerance); - QVERIFY(fabs(top*toMillimeters[unit] - nTop*toMillimeters[QPrinter::Millimeter]) < tolerance); - QVERIFY(fabs(right*toMillimeters[unit] - nRight*toMillimeters[QPrinter::Millimeter]) < tolerance); - QVERIFY(fabs(bottom*toMillimeters[unit] - nBottom*toMillimeters[QPrinter::Millimeter]) < tolerance); - - obj1.getPageMargins(&nLeft, &nTop, &nRight, &nBottom, QPrinter::Point); - QVERIFY(fabs(left*toMillimeters[unit] - nLeft*toMillimeters[QPrinter::Point]) < tolerance); - QVERIFY(fabs(top*toMillimeters[unit] - nTop*toMillimeters[QPrinter::Point]) < tolerance); - QVERIFY(fabs(right*toMillimeters[unit] - nRight*toMillimeters[QPrinter::Point]) < tolerance); - QVERIFY(fabs(bottom*toMillimeters[unit] - nBottom*toMillimeters[QPrinter::Point]) < tolerance); - - obj1.getPageMargins(&nLeft, &nTop, &nRight, &nBottom, QPrinter::Inch); - QVERIFY(fabs(left*toMillimeters[unit] - nLeft*toMillimeters[QPrinter::Inch]) < tolerance); - QVERIFY(fabs(top*toMillimeters[unit] - nTop*toMillimeters[QPrinter::Inch]) < tolerance); - QVERIFY(fabs(right*toMillimeters[unit] - nRight*toMillimeters[QPrinter::Inch]) < tolerance); - QVERIFY(fabs(bottom*toMillimeters[unit] - nBottom*toMillimeters[QPrinter::Inch]) < tolerance); - - obj1.getPageMargins(&nLeft, &nTop, &nRight, &nBottom, QPrinter::Pica); - QVERIFY(fabs(left*toMillimeters[unit] - nLeft*toMillimeters[QPrinter::Pica]) < tolerance); - QVERIFY(fabs(top*toMillimeters[unit] - nTop*toMillimeters[QPrinter::Pica]) < tolerance); - QVERIFY(fabs(right*toMillimeters[unit] - nRight*toMillimeters[QPrinter::Pica]) < tolerance); - QVERIFY(fabs(bottom*toMillimeters[unit] - nBottom*toMillimeters[QPrinter::Pica]) < tolerance); - - obj1.getPageMargins(&nLeft, &nTop, &nRight, &nBottom, QPrinter::Didot); - QVERIFY(fabs(left*toMillimeters[unit] - nLeft*toMillimeters[QPrinter::Didot]) < tolerance); - QVERIFY(fabs(top*toMillimeters[unit] - nTop*toMillimeters[QPrinter::Didot]) < tolerance); - QVERIFY(fabs(right*toMillimeters[unit] - nRight*toMillimeters[QPrinter::Didot]) < tolerance); - QVERIFY(fabs(bottom*toMillimeters[unit] - nBottom*toMillimeters[QPrinter::Didot]) < tolerance); - - obj1.getPageMargins(&nLeft, &nTop, &nRight, &nBottom, QPrinter::Cicero); - QVERIFY(fabs(left*toMillimeters[unit] - nLeft*toMillimeters[QPrinter::Cicero]) < tolerance); - QVERIFY(fabs(top*toMillimeters[unit] - nTop*toMillimeters[QPrinter::Cicero]) < tolerance); - QVERIFY(fabs(right*toMillimeters[unit] - nRight*toMillimeters[QPrinter::Cicero]) < tolerance); - QVERIFY(fabs(bottom*toMillimeters[unit] - nBottom*toMillimeters[QPrinter::Cicero]) < tolerance); -} - -void tst_QPrinter::valuePreservation() -{ - QPrinter::OutputFormat oldFormat = QPrinter::PdfFormat; - QPrinter::OutputFormat newFormat = QPrinter::NativeFormat; // TODO: Correct? - - { - QPrinter printer; - printer.setOutputFormat(oldFormat); - bool status = printer.collateCopies(); - printer.setOutputFormat(newFormat); - printer.setOutputFormat(oldFormat); - QCOMPARE(printer.collateCopies(), status); - - printer.setCollateCopies(!status); - printer.setOutputFormat(newFormat); - QCOMPARE(printer.collateCopies(), !status); - printer.setOutputFormat(oldFormat); - QCOMPARE(printer.collateCopies(), !status); - } - { - QPrinter printer; - printer.setOutputFormat(oldFormat); - QPrinter::ColorMode status = printer.colorMode(); - printer.setOutputFormat(newFormat); - printer.setOutputFormat(oldFormat); - QCOMPARE(printer.colorMode(), status); - - printer.setColorMode(QPrinter::ColorMode(!status)); - printer.setOutputFormat(newFormat); - QCOMPARE(printer.colorMode(), QPrinter::ColorMode(!status)); - printer.setOutputFormat(oldFormat); - QCOMPARE(printer.colorMode(), QPrinter::ColorMode(!status)); - } - { - QPrinter printer; - printer.setOutputFormat(oldFormat); - QString status = printer.creator(); - printer.setOutputFormat(newFormat); - printer.setOutputFormat(oldFormat); - QCOMPARE(printer.creator(), status); - - status = QString::fromLatin1("Mr. Test"); - printer.setCreator(status); - printer.setOutputFormat(newFormat); - QCOMPARE(printer.creator(), status); - printer.setOutputFormat(oldFormat); - QCOMPARE(printer.creator(), status); - } - { - QPrinter printer; - printer.setOutputFormat(oldFormat); - QString status = printer.docName(); - printer.setOutputFormat(newFormat); - printer.setOutputFormat(oldFormat); - QCOMPARE(printer.docName(), status); - - status = QString::fromLatin1("Test document"); - printer.setDocName(status); - printer.setOutputFormat(newFormat); - QCOMPARE(printer.docName(), status); - printer.setOutputFormat(oldFormat); - QCOMPARE(printer.docName(), status); - } - { - QPrinter printer; - printer.setOutputFormat(oldFormat); - bool status = printer.doubleSidedPrinting(); - printer.setOutputFormat(newFormat); - printer.setOutputFormat(oldFormat); - QCOMPARE(printer.doubleSidedPrinting(), status); - - printer.setDoubleSidedPrinting(!status); - printer.setOutputFormat(newFormat); - QCOMPARE(printer.doubleSidedPrinting(), !status); - printer.setOutputFormat(oldFormat); - QCOMPARE(printer.doubleSidedPrinting(), !status); - } - { - QPrinter printer; - printer.setOutputFormat(oldFormat); - bool status = printer.fontEmbeddingEnabled(); - printer.setOutputFormat(newFormat); - printer.setOutputFormat(oldFormat); - QCOMPARE(printer.fontEmbeddingEnabled(), status); - - printer.setFontEmbeddingEnabled(!status); - printer.setOutputFormat(newFormat); - QCOMPARE(printer.fontEmbeddingEnabled(), !status); - printer.setOutputFormat(oldFormat); - QCOMPARE(printer.fontEmbeddingEnabled(), !status); - } - { - QPrinter printer; - printer.setOutputFormat(oldFormat); - bool status = printer.fullPage(); - printer.setOutputFormat(newFormat); - printer.setOutputFormat(oldFormat); - QCOMPARE(printer.fullPage(), status); - - printer.setFullPage(!status); - printer.setOutputFormat(newFormat); - QCOMPARE(printer.fullPage(), !status); - printer.setOutputFormat(oldFormat); - QCOMPARE(printer.fullPage(), !status); - } - { - QPrinter printer; - printer.setOutputFormat(oldFormat); - QPrinter::Orientation status = printer.orientation(); - printer.setOutputFormat(newFormat); - printer.setOutputFormat(oldFormat); - QCOMPARE(printer.orientation(), status); - - printer.setOrientation(QPrinter::Orientation(!status)); - printer.setOutputFormat(newFormat); - QCOMPARE(printer.orientation(), QPrinter::Orientation(!status)); - printer.setOutputFormat(oldFormat); - QCOMPARE(printer.orientation(), QPrinter::Orientation(!status)); - } - { - QPrinter printer; - printer.setOutputFormat(oldFormat); - QString status = printer.outputFileName(); - printer.setOutputFormat(newFormat); - printer.setOutputFormat(oldFormat); - QCOMPARE(printer.outputFileName(), status); - - status = QString::fromLatin1("Test file"); - printer.setOutputFileName(status); - printer.setOutputFormat(newFormat); - QCOMPARE(printer.outputFileName(), status); - printer.setOutputFormat(oldFormat); - QCOMPARE(printer.outputFileName(), status); - } - { - QPrinter printer; - printer.setOutputFormat(oldFormat); - QPrinter::PageOrder status = printer.pageOrder(); - printer.setOutputFormat(newFormat); - printer.setOutputFormat(oldFormat); - QCOMPARE(printer.pageOrder(), status); - - printer.setPageOrder(QPrinter::PageOrder(!status)); - printer.setOutputFormat(newFormat); - QCOMPARE(printer.pageOrder(), QPrinter::PageOrder(!status)); - printer.setOutputFormat(oldFormat); - QCOMPARE(printer.pageOrder(), QPrinter::PageOrder(!status)); - } - { - QPrinter printer; - printer.setOutputFormat(oldFormat); - QPrinter::PageSize status = printer.pageSize(); - printer.setOutputFormat(newFormat); - printer.setOutputFormat(oldFormat); - QCOMPARE(printer.pageSize(), status); - - printer.setPageSize(QPrinter::B5); - printer.setOutputFormat(newFormat); - QCOMPARE(printer.pageSize(), QPrinter::B5); - printer.setOutputFormat(oldFormat); - QCOMPARE(printer.pageSize(), QPrinter::B5); - } - { - QPrinter printer; - printer.setOutputFormat(oldFormat); - QPrinter::PaperSource status = printer.paperSource(); - printer.setOutputFormat(newFormat); - printer.setOutputFormat(oldFormat); - QCOMPARE(printer.paperSource(), status); - - printer.setPaperSource(QPrinter::Manual); - printer.setOutputFormat(newFormat); - QCOMPARE(printer.paperSource(), QPrinter::Manual); - printer.setOutputFormat(oldFormat); - QCOMPARE(printer.paperSource(), QPrinter::Manual); - } - { - QPrinter printer; - printer.setOutputFormat(oldFormat); - QString status = printer.printProgram(); - printer.setOutputFormat(newFormat); - printer.setOutputFormat(oldFormat); - QCOMPARE(printer.printProgram(), status); - - status = QString::fromLatin1("/usr/local/bin/lpr"); - printer.setPrintProgram(status); - printer.setOutputFormat(newFormat); - QCOMPARE(printer.printProgram(), status); - printer.setOutputFormat(oldFormat); - QCOMPARE(printer.printProgram(), status); - } - { - QPrinter printer; - printer.setOutputFormat(oldFormat); - QPrinter::PrintRange status = printer.printRange(); - printer.setOutputFormat(newFormat); - printer.setOutputFormat(oldFormat); - QCOMPARE(printer.printRange(), status); - - printer.setPrintRange(QPrinter::PrintRange(!status)); - printer.setOutputFormat(newFormat); - QCOMPARE(printer.printRange(), QPrinter::PrintRange(!status)); - printer.setOutputFormat(oldFormat); - QCOMPARE(printer.printRange(), QPrinter::PrintRange(!status)); - } - { - QPrinter printer; - printer.setOutputFormat(oldFormat); - QString status = printer.printerName(); - printer.setOutputFormat(newFormat); - printer.setOutputFormat(oldFormat); - QCOMPARE(printer.printerName(), status); - - status = QString::fromLatin1("SuperDuperPrinter"); - printer.setPrinterName(status); - printer.setOutputFormat(newFormat); - QCOMPARE(printer.printerName(), status); - printer.setOutputFormat(oldFormat); - QCOMPARE(printer.printerName(), status); - } -#ifndef Q_OS_WIN - { - QPrinter printer; - printer.setOutputFormat(oldFormat); - QString status = printer.printerSelectionOption(); - printer.setOutputFormat(newFormat); - printer.setOutputFormat(oldFormat); - QCOMPARE(printer.printerSelectionOption(), status); - - status = QString::fromLatin1("Optional option"); - printer.setPrinterSelectionOption(status); - printer.setOutputFormat(newFormat); - QCOMPARE(printer.printerSelectionOption(), status); - printer.setOutputFormat(oldFormat); - QCOMPARE(printer.printerSelectionOption(), status); - } -#endif - { - QPrinter printer; - printer.setOutputFormat(oldFormat); - int status = printer.resolution(); - printer.setOutputFormat(newFormat); - printer.setOutputFormat(oldFormat); - QCOMPARE(printer.resolution(), status); - - printer.setResolution(status-150); - printer.setOutputFormat(newFormat); - QCOMPARE(printer.resolution(), status-150); - printer.setOutputFormat(oldFormat); - QCOMPARE(printer.resolution(), status-150); - } -} - -void tst_QPrinter::errorReporting() -{ - QPrinter p; - p.setOutputFormat(QPrinter::PdfFormat); - QCOMPARE(p.isValid(), true); - QPainter painter; -#ifndef Q_WS_WIN - // not sure how to choose a never-writable file on windows. But its QFile behavior anyway, so lets rely on it failing elsewhere - p.setOutputFileName("/foobar/nonwritable.pdf"); - QCOMPARE(painter.begin(&p), false); // it should check the output file is writable -#endif - p.setOutputFileName("test.pdf"); - TempFileCleanup tmpFile("test.pdf"); - QCOMPARE(painter.begin(&p), true); // it should check the output - QCOMPARE(p.isValid(), true); - painter.end(); -} - -void tst_QPrinter::testCustomPageSizes() -{ - QPrinter p; - - QSizeF customSize(8.5, 11.0); - p.setPaperSize(customSize, QPrinter::Inch); - - QSizeF paperSize = p.paperSize(QPrinter::Inch); - QCOMPARE(paperSize, customSize); - - QPrinter p2(QPrinter::HighResolution); - p2.setPaperSize(customSize, QPrinter::Inch); - paperSize = p.paperSize(QPrinter::Inch); - QCOMPARE(paperSize, customSize); -} - -#if !defined(QT_NO_COMPLETER) && !defined(QT_NO_FILEDIALOG) -void tst_QPrinter::printDialogCompleter() -{ - QPrintDialog dialog; - dialog.printer()->setOutputFileName("file.pdf"); - TempFileCleanup tmpFile("file.pdf"); - dialog.setEnabledOptions(QAbstractPrintDialog::PrintToFile); - dialog.show(); - - QTest::qWait(100); - - QTest::keyClick(&dialog, Qt::Key_Tab); - QTest::keyClick(&dialog, 'P'); - // The test passes if it doesn't crash. -} -#endif - -void tst_QPrinter::testCopyCount() -{ - QPrinter p; - p.setCopyCount(15); - QCOMPARE(p.copyCount(), 15); -} - -static void printPage(QPainter *painter) -{ - painter->setPen(QPen(Qt::black, 4)); - painter->drawRect(50, 60, 70, 80); -} - -void tst_QPrinter::taskQTBUG4497_reusePrinterOnDifferentFiles() -{ - TempFileCleanup tmpFile1("out1.ps"); - TempFileCleanup tmpFile2("out2.ps"); - - QPrinter printer; - { - - printer.setOutputFileName("out1.ps"); - QPainter painter(&printer); - printPage(&painter); - - } - { - - printer.setOutputFileName("out2.ps"); - QPainter painter(&printer); - printPage(&painter); - - } - QFile file1("out1.ps"); - QVERIFY(file1.open(QIODevice::ReadOnly)); - - QFile file2("out2.ps"); - QVERIFY(file2.open(QIODevice::ReadOnly)); - - QEXPECT_FAIL("", "QTBUG-22562, QTBUG-22296", Abort); - QCOMPARE(file1.readAll(), file2.readAll()); -} - -void tst_QPrinter::testCurrentPage() -{ - QPrinter printer; - printer.setFromTo(1, 10); - - // Test set print range - printer.setPrintRange(QPrinter::CurrentPage); - QCOMPARE(printer.printRange(), QPrinter::CurrentPage); - QCOMPARE(printer.fromPage(), 1); - QCOMPARE(printer.toPage(), 10); - - QPrintDialog dialog(&printer); - - // Test default Current Page option to off - QCOMPARE(dialog.isOptionEnabled(QPrintDialog::PrintCurrentPage), false); - - // Test enable Current Page option - dialog.setOption(QPrintDialog::PrintCurrentPage); - QCOMPARE(dialog.isOptionEnabled(QPrintDialog::PrintCurrentPage), true); - -} - -void tst_QPrinter::testPdfTitle() -{ - // Check the document name is represented correctly in produced pdf - { - QPainter painter; - QPrinter printer; - // This string is just the UTF-8 encoding of the string: \()f ø hiragana o - const unsigned char titleBuf[]={0x5c, 0x28, 0x29, 0x66, 0xc3, 0xb8, 0xe3, 0x81, 0x8a, 0x00}; - const char *title = reinterpret_cast<const char*>(titleBuf); - printer.setOutputFileName("file.pdf"); - printer.setDocName(QString::fromUtf8(title)); - painter.begin(&printer); - painter.end(); - } - TempFileCleanup tmpFile("file.pdf"); - QFile file("file.pdf"); - QVERIFY(file.open(QIODevice::ReadOnly)); - // The we expect the title to appear in the PDF as: - // ASCII('\title (') UTF16(\\\(\)f ø hiragana o) ASCII(')'). - // which has the following binary representation - const unsigned char expectedBuf[] = { - 0x2f, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x20, 0x28, 0xfe, - 0xff, 0x00, 0x5c, 0x5c, 0x00, 0x5c, 0x28, 0x00, 0x5c, - 0x29, 0x00, 0x66, 0x00, 0xf8, 0x30, 0x4a, 0x29}; - const char *expected = reinterpret_cast<const char*>(expectedBuf); - QVERIFY(file.readAll().contains(QByteArray(expected, 26))); -} - -#endif - -QTEST_MAIN(tst_QPrinter) -#include "tst_qprinter.moc" diff --git a/tests/auto/gui/painting/qprinterinfo/.gitignore b/tests/auto/gui/painting/qprinterinfo/.gitignore deleted file mode 100644 index fcef7c1997..0000000000 --- a/tests/auto/gui/painting/qprinterinfo/.gitignore +++ /dev/null @@ -1 +0,0 @@ -tst_qprinterinfo diff --git a/tests/auto/gui/painting/qprinterinfo/qprinterinfo.pro b/tests/auto/gui/painting/qprinterinfo/qprinterinfo.pro deleted file mode 100644 index 88cb07f338..0000000000 --- a/tests/auto/gui/painting/qprinterinfo/qprinterinfo.pro +++ /dev/null @@ -1,10 +0,0 @@ -CONFIG += testcase -TARGET = tst_qprinterinfo -SOURCES += tst_qprinterinfo.cpp - -QT += printsupport network testlib - -DEFINES += QT_USE_USING_NAMESPACE - -mac: CONFIG += insignificant_test # QTBUG-23060 -win32:CONFIG += insignificant_test # QTBUG-24190 diff --git a/tests/auto/gui/painting/qprinterinfo/tst_qprinterinfo.cpp b/tests/auto/gui/painting/qprinterinfo/tst_qprinterinfo.cpp deleted file mode 100644 index 2323dc8df3..0000000000 --- a/tests/auto/gui/painting/qprinterinfo/tst_qprinterinfo.cpp +++ /dev/null @@ -1,393 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include <QtTest/QtTest> -#include <QtGlobal> -#include <QtAlgorithms> -#include <QtNetwork/QHostInfo> -#include <qprinterinfo.h> - -#ifdef Q_OS_UNIX -# include <unistd.h> -# include <sys/types.h> -# include <sys/wait.h> -#endif - -Q_DECLARE_METATYPE(QRect) - -class tst_QPrinterInfo : public QObject -{ - Q_OBJECT - -#ifdef QT_NO_PRINTER -public slots: - void initTestCase(); -#else -private slots: - void testForDefaultPrinter(); - void testForPrinters(); - void testForPaperSizes(); - void testConstructors(); - void testAssignment(); - -private: - void macFixNameFormat(QString *printerName); - QString getDefaultPrinterFromSystem(); - QStringList getPrintersFromSystem(); - - QString getOutputFromCommand(const QStringList& command); -#endif -}; - -#ifdef QT_NO_PRINTER -void tst_QPrinterInfo::initTestCase() -{ - QSKIP("This test requires printing support"); -} - -#else - -void tst_QPrinterInfo::macFixNameFormat(QString *printerName) -{ -// Modify the format of the printer name to match Qt, lpstat returns -// foo___domain_no, Qt returns foo @ domain.no -#ifdef Q_OS_MAC - printerName->replace(QLatin1String("___"), QLatin1String(" @ ")); - printerName->replace(QLatin1String("_"), QLatin1String(".")); -#else - Q_UNUSED(printerName); -#endif -} - -QString tst_QPrinterInfo::getDefaultPrinterFromSystem() -{ - QStringList command; - command << "lpstat" << "-d"; - QString output = getOutputFromCommand(command); - - QRegExp noDefaultReg("[^:]*no .*default"); - int pos = noDefaultReg.indexIn(output); - if (pos >= 0) { - return QString(); - } - - QRegExp defaultReg("default.*: *([a-zA-Z0-9_-]+)"); - defaultReg.indexIn(output); - QString printer = defaultReg.cap(1); - macFixNameFormat(&printer); - return printer; -} - -QStringList tst_QPrinterInfo::getPrintersFromSystem() -{ - QStringList ans; - - QStringList command; - command << "lpstat" << "-p"; - QString output = getOutputFromCommand(command); - QStringList list = output.split(QChar::fromLatin1('\n')); - - QRegExp reg("^[Pp]rinter ([.a-zA-Z0-9-_@]+)"); - for (int c = 0; c < list.size(); ++c) { - if (reg.indexIn(list[c]) >= 0) { - QString printer = reg.cap(1); - macFixNameFormat(&printer); - ans << printer; - } - } - - return ans; -} - -// This function does roughly the same as the `command substitution` in -// the shell. -QString tst_QPrinterInfo::getOutputFromCommand(const QStringList& command) -{ -// The command execution does nothing on non-unix systems. -#ifdef Q_OS_UNIX - int pid; - int status = 0; - int pipePtr[2]; - - // Create a pipe that is shared between parent and child process. - if (pipe(pipePtr) < 0) { - return QString(); - } - pid = fork(); - if (pid < 0) { - close(pipePtr[0]); - close(pipePtr[1]); - return QString(); - } else if (pid == 0) { - // In child. - // Close the reading end. - close(pipePtr[0]); - // Redirect stdout to the pipe. - if (dup2(pipePtr[1], 1) < 0) { - exit(1); - } - - char** argv = new char*[command.size()+1]; - for (int c = 0; c < command.size(); ++c) { - argv[c] = new char[command[c].size()+1]; - strcpy(argv[c], command[c].toLatin1().data()); - } - argv[command.size()] = NULL; - execvp(argv[0], argv); - // Shouldn't get here, but it's possible if command is not found. - close(pipePtr[1]); - close(1); - for (int c = 0; c < command.size(); ++c) { - delete [] argv[c]; - } - delete [] argv; - exit(1); - } else { - // In parent. - // Close the writing end. - close(pipePtr[1]); - - QFile pipeRead; - if (!pipeRead.open(pipePtr[0], QIODevice::ReadOnly)) { - close(pipePtr[0]); - return QString(); - } - QByteArray array; - array = pipeRead.readAll(); - pipeRead.close(); - close(pipePtr[0]); - wait(&status); - return QString(array); - } -#else - return QString(); -#endif -} - -void tst_QPrinterInfo::testForDefaultPrinter() -{ -#if defined(Q_OS_UNIX) || defined(Q_OS_WIN32) -# ifdef Q_OS_WIN32 - if (QHostInfo::localHostName() == "fantomet" || QHostInfo::localHostName() == "bobo") { - QWARN("Test is hardcoded to \"fantomet\" and \"bobo\" on Windows and may fail"); - } else { - QSKIP("Test is hardcoded to \"fantomet\" and \"bobo\" on Windows"); - } - QString defSysPrinter; - if (QHostInfo::localHostName() == "fantomet") { - defSysPrinter = "Yacc (Lexmark Optra T610 PS3)"; - } else if (QHostInfo::localHostName() == "bobo") { - defSysPrinter = "press"; - } -# else - QString defSysPrinter = getDefaultPrinterFromSystem(); -# endif - if (defSysPrinter == "") - QSKIP("No default printer available"); - - QList<QPrinterInfo> list = QPrinterInfo::availablePrinters(); - bool found = false; - for (int c = 0; c < list.size(); ++c) { - if (list[c].isDefault()) { - QVERIFY(list.at(c).printerName() == defSysPrinter); - QVERIFY(!list.at(c).isNull()); - found = true; - } else { - QVERIFY(list.at(c).printerName() != defSysPrinter); - QVERIFY(!list.at(c).isNull()); - } - } - - if (!found && defSysPrinter != "") QFAIL("No default printer reported by Qt, although there is one"); -#else - QSKIP("Test doesn't work on non-Unix"); -#endif -} - -void tst_QPrinterInfo::testForPrinters() -{ -#if defined(Q_OS_UNIX) || defined(Q_OS_WIN32) -# ifdef Q_OS_WIN32 - if (QHostInfo::localHostName() == "fantomet" || QHostInfo::localHostName() == "bobo") { - QWARN("Test is hardcoded to \"fantomet\" and \"bobo\" on Windows and may fail"); - } else { - QSKIP("Test is hardcoded to \"fantomet\" and \"bobo\" on Windows"); - } - QStringList sysPrinters; - if (QHostInfo::localHostName() == "fantomet") { - sysPrinters - << "Press" - << "Canon PS-IPU Color Laser Copier v52.3" - << "EPSON EPL-N4000 PS3" - << "Kroksleiven" - << "Lexmark Optra Color 1200 PS" - << "Yacc (Lexmark Optra T610 PCL)" - << "Yacc (Lexmark Optra T610 PS3)" - ; - } else if (QHostInfo::localHostName() == "bobo") { - sysPrinters - << "press" - << "finnmarka" - << "nordmarka" - ; - } -# else - QStringList sysPrinters = getPrintersFromSystem(); -# endif - QList<QPrinterInfo> printers = QPrinterInfo::availablePrinters(); - - QCOMPARE(printers.size(), sysPrinters.size()); - - QHash<QString, bool> qtPrinters; - - for (int j = 0; j < printers.size(); ++j) { - qtPrinters.insert(printers.at(j).printerName(), !printers.at(j).isNull()); - } - - for (int i = 0; i < sysPrinters.size(); ++i) { - if (!qtPrinters.value(sysPrinters.at(i))) { - qDebug() << "Available printers: " << qtPrinters; - QFAIL(qPrintable(QString("Printer '%1' reported by system, but not reported by Qt").arg(sysPrinters.at(i)))); - } - } -#else - QSKIP("Test doesn't work on non-Unix"); -#endif -} - -void tst_QPrinterInfo::testForPaperSizes() -{ -QSKIP("PaperSize feature doesn't work on Windows, fails on Mac, and is unstable on Linux"); - // This test is based on common printers found at the Oslo - // office. It is likely to be skipped or fail for other locations. - QStringList hardPrinters; - hardPrinters << "Finnmarka" << "Huldra"; - - QList<QList<QPrinter::PaperSize> > hardSizes; - hardSizes - << QList<QPrinter::PaperSize>() - << QList<QPrinter::PaperSize>() - ; - hardSizes[0] // Finnmarka - << QPrinter::Letter - << QPrinter::A4 - << QPrinter::A3 - << QPrinter::A5 - << QPrinter::B4 - << QPrinter::B5 - << QPrinter::Custom // COM10 - << QPrinter::Custom // C5 - << QPrinter::Custom // DL - << QPrinter::Custom // Monarch - << QPrinter::Executive - << QPrinter::Custom // Foolscap - << QPrinter::Custom // ISO B5 - << QPrinter::Ledger - << QPrinter::Legal - << QPrinter::Custom // Japanese Post Card - << QPrinter::Custom // Invoice - ; - hardSizes[1] // Huldra - << QPrinter::Custom // Not listed at http://localhost:631/, name "Custom" - << QPrinter::Letter - << QPrinter::A4 - << QPrinter::A5 - << QPrinter::A6 - << QPrinter::B5 - << QPrinter::Custom // #5 1/2 Envelope - << QPrinter::Custom // 6x9 Envelope - << QPrinter::Custom // #10 Envelope - << QPrinter::Custom // A7 Envelope - << QPrinter::Custom // C5 Envelope - << QPrinter::Custom // DL Envelope - << QPrinter::Custom // Monarch Envelope - << QPrinter::Custom // #6 3/4 Envelope - << QPrinter::Executive - << QPrinter::Custom // US Folio - << QPrinter::Custom // Index Card - << QPrinter::Custom // ISO B5 - << QPrinter::Legal - << QPrinter::Custom // Statement - ; - - QList<QPrinterInfo> printers = QPrinterInfo::availablePrinters(); - for (int i = 0; i < printers.size(); ++i) { - for (int j = 0; j < hardPrinters.size(); ++j) { - if (printers[i].printerName() == hardPrinters[j]) { - QList<QPrinter::PaperSize> sizes = printers[i].supportedPaperSizes(); - qSort(sizes); - qSort(hardSizes[j]); - QCOMPARE(sizes, hardSizes[j]); - } - } - } -} - -void tst_QPrinterInfo::testConstructors() -{ - QList<QPrinterInfo> prns(QPrinterInfo::availablePrinters()); - - for (int c = 0; c < prns.size(); ++c) { - QList<QPrinter::PaperSize> list1, list2; - list1 = prns[c].supportedPaperSizes(); - QPrinter pr(prns[c]); - list2 = QPrinterInfo(pr).supportedPaperSizes(); - QCOMPARE(list2, list1); - } -} - -void tst_QPrinterInfo::testAssignment() -{ - QList<QPrinterInfo> prns(QPrinterInfo::availablePrinters()); - - for (int c = 0; c < prns.size(); ++c) { - QPrinterInfo pi = QPrinterInfo::defaultPrinter(); - pi = prns[c]; - QCOMPARE(pi.printerName(), prns[c].printerName()); - QCOMPARE(pi.supportedPaperSizes(), prns[c].supportedPaperSizes()); - } -} - -#endif - -QTEST_MAIN(tst_QPrinterInfo) -#include "tst_qprinterinfo.moc" diff --git a/tests/auto/gui/text/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro b/tests/auto/gui/text/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro index 025b3f8a26..3848a287dc 100644 --- a/tests/auto/gui/text/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro +++ b/tests/auto/gui/text/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro @@ -4,7 +4,7 @@ CONFIG += testcase TARGET = tst_qabstracttextdocumentlayout -QT += widgets testlib +QT += testlib SOURCES += tst_qabstracttextdocumentlayout.cpp diff --git a/tests/auto/gui/text/qstatictext/qstatictext.pro b/tests/auto/gui/text/qstatictext/qstatictext.pro index a0955af710..67f2e047a4 100644 --- a/tests/auto/gui/text/qstatictext/qstatictext.pro +++ b/tests/auto/gui/text/qstatictext/qstatictext.pro @@ -1,6 +1,6 @@ CONFIG += testcase TARGET = tst_qstatictext -QT += widgets widgets-private testlib +QT += testlib QT += core core-private gui gui-private SOURCES += tst_qstatictext.cpp diff --git a/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp b/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp index 66145f2dcf..fbb9549425 100644 --- a/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp +++ b/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <QtWidgets/QApplication> +#include <QtGui/QGuiApplication> #include <QtGui/QPainter> #include <QtGui/QImage> @@ -48,7 +48,6 @@ #include <qpaintengine.h> #include <private/qstatictext_p.h> -#include <private/qapplication_p.h> // #define DEBUG_SAVE_IMAGE @@ -296,7 +295,7 @@ void tst_QStaticText::prepareToWrongData() void tst_QStaticText::setFont() { - QFont font = QApplication::font(); + QFont font = QGuiApplication::font(); font.setBold(true); font.setPointSize(28); @@ -618,7 +617,7 @@ void tst_QStaticText::plainTextVsRichText() void tst_QStaticText::setPenPlainText() { - QFont font = QApplication::font(); + QFont font = QGuiApplication::font(); font.setStyleStrategy(QFont::NoAntialias); QFontMetricsF fm(font); @@ -646,7 +645,7 @@ void tst_QStaticText::setPenPlainText() void tst_QStaticText::setPenRichText() { - QFont font = QApplication::font(); + QFont font = QGuiApplication::font(); font.setStyleStrategy(QFont::NoAntialias); QFontMetricsF fm(font); @@ -675,7 +674,7 @@ void tst_QStaticText::setPenRichText() void tst_QStaticText::richTextOverridesPen() { - QFont font = QApplication::font(); + QFont font = QGuiApplication::font(); font.setStyleStrategy(QFont::NoAntialias); QFontMetricsF fm(font); diff --git a/tests/auto/gui/text/qtextblock/qtextblock.pro b/tests/auto/gui/text/qtextblock/qtextblock.pro index cad009a35a..cf3456bbf6 100644 --- a/tests/auto/gui/text/qtextblock/qtextblock.pro +++ b/tests/auto/gui/text/qtextblock/qtextblock.pro @@ -1,7 +1,7 @@ CONFIG += testcase TARGET = tst_qtextblock -QT += widgets widgets-private testlib +QT += testlib QT += core-private gui-private SOURCES += tst_qtextblock.cpp diff --git a/tests/auto/gui/text/qtextpiecetable/qtextpiecetable.pro b/tests/auto/gui/text/qtextpiecetable/qtextpiecetable.pro index 930d18f5fe..1419e32012 100644 --- a/tests/auto/gui/text/qtextpiecetable/qtextpiecetable.pro +++ b/tests/auto/gui/text/qtextpiecetable/qtextpiecetable.pro @@ -1,6 +1,6 @@ CONFIG += testcase TARGET = tst_qtextpiecetable -QT += widgets widgets-private testlib +QT += testlib QT += core-private gui-private SOURCES += tst_qtextpiecetable.cpp HEADERS += ../qtextdocument/common.h diff --git a/tests/auto/gui/util/qdesktopservices/qdesktopservices.pro b/tests/auto/gui/util/qdesktopservices/qdesktopservices.pro index 98bc5c3d0d..cf14e6b47a 100644 --- a/tests/auto/gui/util/qdesktopservices/qdesktopservices.pro +++ b/tests/auto/gui/util/qdesktopservices/qdesktopservices.pro @@ -1,5 +1,5 @@ CONFIG += testcase -QT += widgets testlib +QT += testlib SOURCES += tst_qdesktopservices.cpp TARGET = tst_qdesktopservices diff --git a/tests/auto/gui/util/qdesktopservices/tst_qdesktopservices.cpp b/tests/auto/gui/util/qdesktopservices/tst_qdesktopservices.cpp index ad45d00520..0ad37c21e8 100644 --- a/tests/auto/gui/util/qdesktopservices/tst_qdesktopservices.cpp +++ b/tests/auto/gui/util/qdesktopservices/tst_qdesktopservices.cpp @@ -41,7 +41,6 @@ #include <QtTest/QtTest> -#include <QStandardItemModel> #include <qdebug.h> #include <qdesktopservices.h> |
