diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-18 16:09:02 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-18 16:09:02 +0100 |
commit | c849591e76fc80b0eea262e8a1ae3e6b3f03429c (patch) | |
tree | c85670103bca8a6be34e86c79c6445e765482c3d /tests | |
parent | f650f1a2c6d2c995cda16f11a6281936f699cab7 (diff) | |
parent | 84abe5fcf2a70de7bf8503641e8617383693882e (diff) | |
download | qtsvg-c849591e76fc80b0eea262e8a1ae3e6b3f03429c.tar.gz |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I9b3bad61dde9a1e21a3501c204b8afc664a04556
Diffstat (limited to 'tests')
3 files changed, 2 insertions, 7 deletions
diff --git a/tests/auto/bic/data/QtSvg.5.0.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtSvg.5.0.0.linux-gcc-ia32.txt index ba5545a..85f36ab 100644 --- a/tests/auto/bic/data/QtSvg.5.0.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtSvg.5.0.0.linux-gcc-ia32.txt @@ -2412,11 +2412,6 @@ QObjectCleanupHandler (0xb422e5dc) 0 QObject (0xb4022508) 0 primary-for QObjectCleanupHandler (0xb422e5dc) -Class QPointerBase - size=8 align=4 - base size=8 base align=4 -QPointerBase (0xb4022a48) 0 - Class QSharedMemory::QPrivateSignal size=1 align=1 base size=0 base align=1 diff --git a/tests/auto/qsvggenerator/referenceSvgs/fileName_output.svg b/tests/auto/qsvggenerator/referenceSvgs/fileName_output.svg index 7799b7f..1e78e17 100644 --- a/tests/auto/qsvggenerator/referenceSvgs/fileName_output.svg +++ b/tests/auto/qsvggenerator/referenceSvgs/fileName_output.svg @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.2" baseProfile="tiny"> -<title>Qt Svg Document</title> +<title>Qt SVG Document</title> <desc>Generated with Qt</desc> <defs> </defs> diff --git a/tests/auto/qsvggenerator/referenceSvgs/radial_gradient.svg b/tests/auto/qsvggenerator/referenceSvgs/radial_gradient.svg index eee8b6e..2c5c03e 100644 --- a/tests/auto/qsvggenerator/referenceSvgs/radial_gradient.svg +++ b/tests/auto/qsvggenerator/referenceSvgs/radial_gradient.svg @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg width="70.5556mm" height="35.2778mm" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.2" baseProfile="tiny"> -<title>Qt Svg Document</title> +<title>Qt SVG Document</title> <desc>Generated with Qt</desc> <defs> <radialGradient gradientUnits="objectBoundingBox" cx="0.5" cy="0.5" r="0.5" fx="0.5" fy="0.5" xml:id="gradient1"> |