From a202a900cf8838d01bad178be39d7e4a065ac56f Mon Sep 17 00:00:00 2001 From: Sune Vuorela Date: Tue, 12 Apr 2016 20:40:54 +0200 Subject: Handle PdmDevicePixelRatioScaled metric Quiets a warning about an unhandled member. Change-Id: I20f6b6849176df541fba2e1a75d1d4ee8f2df303 Reviewed-by: Mitch Curtis --- src/svg/qsvggenerator.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/svg/qsvggenerator.cpp b/src/svg/qsvggenerator.cpp index ca99de1..3bc5846 100644 --- a/src/svg/qsvggenerator.cpp +++ b/src/svg/qsvggenerator.cpp @@ -794,6 +794,7 @@ int QSvgGenerator::metric(QPaintDevice::PaintDeviceMetric metric) const case QPaintDevice::PdmPhysicalDpiY: return d->engine->resolution(); case QPaintDevice::PdmDevicePixelRatio: + case QPaintDevice::PdmDevicePixelRatioScaled: return 1; default: qWarning("QSvgGenerator::metric(), unhandled metric %d\n", metric); -- cgit v1.2.1 From e02df9c098b4d304b34c0ff65806a0576e45ed1a Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 18 Apr 2016 13:43:58 +0200 Subject: qtsvg.qdocconf: Fix plugin paths. Fix qdoc warnings: ../qtsvg/src/svg/doc/qtsvg.qdocconf:33: warning: Cannot find file or directory: ../../plugins/svg ../qtsvg/src/svg/doc/qtsvg.qdocconf:36: warning: Cannot find file or directory: ../../plugins/svg Change-Id: I6a085c539bd0244184e5b9a53878fb1e0144bd4c Reviewed-by: aavit --- src/svg/doc/qtsvg.qdocconf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/svg/doc/qtsvg.qdocconf b/src/svg/doc/qtsvg.qdocconf index e8460e9..d934f61 100644 --- a/src/svg/doc/qtsvg.qdocconf +++ b/src/svg/doc/qtsvg.qdocconf @@ -31,10 +31,12 @@ depends += qtcore \ tagfile = ../../../doc/qtsvg/qtsvg.tags headerdirs += .. \ - ../../plugins/svg + ../../plugins/imageformats \ + ../../plugins/iconengines sourcedirs += .. \ - ../../plugins/svg + ../../plugins/imageformats \ + ../../plugins/iconengines exampledirs += ../../../examples/svg \ snippets/ -- cgit v1.2.1 From 3846c5103b5af8b582609dd994c65ec8dab46994 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 21 Apr 2016 16:34:03 +0200 Subject: remove unreferenced svg files Change-Id: I97d904adb62eda37b0d40a1b33ea62aa9f66f5ff Reviewed-by: Eirik Aavitsland --- examples/svg/embeddedsvgviewer/shapes.svg | 86 ------------------------------ examples/svg/embeddedsvgviewer/spheres.svg | 81 ---------------------------- 2 files changed, 167 deletions(-) delete mode 100644 examples/svg/embeddedsvgviewer/shapes.svg delete mode 100644 examples/svg/embeddedsvgviewer/spheres.svg diff --git a/examples/svg/embeddedsvgviewer/shapes.svg b/examples/svg/embeddedsvgviewer/shapes.svg deleted file mode 100644 index c28a711..0000000 --- a/examples/svg/embeddedsvgviewer/shapes.svg +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/examples/svg/embeddedsvgviewer/spheres.svg b/examples/svg/embeddedsvgviewer/spheres.svg deleted file mode 100644 index e108777..0000000 --- a/examples/svg/embeddedsvgviewer/spheres.svg +++ /dev/null @@ -1,81 +0,0 @@ - - - Spheres - Gradient filled spheres with different colors. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.1 From 0ec491a815756dd92d0576d280e61901448ea8d3 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 21 Apr 2016 16:37:15 +0200 Subject: delete .desktop files of examples they were added without an explanation, and they can't be particularly useful (because they contain hard-coded paths and refer to non-existing icons). Change-Id: I5f0bb2efbdfa296c07a65afacac5fb1d80490037 Reviewed-by: Eirik Aavitsland --- examples/svg/richtext/textobject/textobject.desktop | 11 ----------- examples/svg/svggenerator/svggenerator.desktop | 11 ----------- examples/svg/svgviewer/svgviewer.desktop | 11 ----------- 3 files changed, 33 deletions(-) delete mode 100644 examples/svg/richtext/textobject/textobject.desktop delete mode 100644 examples/svg/svggenerator/svggenerator.desktop delete mode 100644 examples/svg/svgviewer/svgviewer.desktop diff --git a/examples/svg/richtext/textobject/textobject.desktop b/examples/svg/richtext/textobject/textobject.desktop deleted file mode 100644 index 1b0980f..0000000 --- a/examples/svg/richtext/textobject/textobject.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Terminal=false -Name=Text Object -Exec=/opt/usr/bin/textobject -Icon=textobject -X-Window-Icon= -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable diff --git a/examples/svg/svggenerator/svggenerator.desktop b/examples/svg/svggenerator/svggenerator.desktop deleted file mode 100644 index 3ae32a4..0000000 --- a/examples/svg/svggenerator/svggenerator.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Terminal=false -Name=SVG Generator -Exec=/opt/usr/bin/svggenerator -Icon=svggenerator -X-Window-Icon= -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable diff --git a/examples/svg/svgviewer/svgviewer.desktop b/examples/svg/svgviewer/svgviewer.desktop deleted file mode 100644 index 477ef78..0000000 --- a/examples/svg/svgviewer/svgviewer.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Terminal=false -Name=SVG Viewer -Exec=/opt/usr/bin/svgviewer -Icon=svgviewer -X-Window-Icon= -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable -- cgit v1.2.1 From cf25ebcf482ada36f5b5e0bb983a01cf2ab42f46 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 21 Apr 2016 16:40:35 +0200 Subject: purge symbian vestige Change-Id: Ic1bc43b92a8c211ecadf1f2988fbb33779a27c08 Reviewed-by: Oswald Buddenhagen --- examples/svg/embedded/fluidlauncher/backup_registration.xml | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 examples/svg/embedded/fluidlauncher/backup_registration.xml diff --git a/examples/svg/embedded/fluidlauncher/backup_registration.xml b/examples/svg/embedded/fluidlauncher/backup_registration.xml deleted file mode 100644 index 794e11d..0000000 --- a/examples/svg/embedded/fluidlauncher/backup_registration.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - -- cgit v1.2.1 From 0e69a7c86f1908bc282362ec59f0ccf97d35d63a Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Tue, 10 May 2016 14:54:30 +0200 Subject: Doc: Remove repository name from examplesinstallpath Examples in binary packages now directly match the install path. Change-Id: I15cc16953efdfb3e327de82e3f6c412941811853 Task-number: QTBUG-52953 Reviewed-by: Antti Kokko --- src/svg/doc/qtsvg.qdocconf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/svg/doc/qtsvg.qdocconf b/src/svg/doc/qtsvg.qdocconf index d934f61..b180daa 100644 --- a/src/svg/doc/qtsvg.qdocconf +++ b/src/svg/doc/qtsvg.qdocconf @@ -41,7 +41,7 @@ sourcedirs += .. \ exampledirs += ../../../examples/svg \ snippets/ -examplesinstallpath = qtsvg/svg +examplesinstallpath = svg imagedirs += images -- cgit v1.2.1 From 109def32cd95af417d1f6a34996140f6aa46b857 Mon Sep 17 00:00:00 2001 From: Joni Poikelin Date: Thu, 12 May 2016 12:55:33 +0300 Subject: Fix QSvgIconEngine fallback to try icon with same state first If icon is not explicitly set, QSvgIconEngine always took Normal Off icon. Task-number: QTBUG-53328 Change-Id: I404206b0244d0009f7be1f520c2e84c0b7cd3e71 Reviewed-by: Andy Shaw Reviewed-by: Eirik Aavitsland --- src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp b/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp index 0ccf551..086f5a9 100644 --- a/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp +++ b/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp @@ -116,10 +116,13 @@ QSize QSvgIconEngine::actualSize(const QSize &size, QIcon::Mode mode, void QSvgIconEnginePrivate::loadDataForModeAndState(QSvgRenderer *renderer, QIcon::Mode mode, QIcon::State state) { QByteArray buf; + const QIcon::State oppositeState = state == QIcon::Off ? QIcon::On : QIcon::Off; if (svgBuffers) { buf = svgBuffers->value(hashKey(mode, state)); if (buf.isEmpty()) - buf = svgBuffers->value(hashKey(QIcon::Normal, QIcon::Off)); + buf = svgBuffers->value(hashKey(QIcon::Normal, state)); + if (buf.isEmpty()) + buf = svgBuffers->value(hashKey(QIcon::Normal, oppositeState)); } if (!buf.isEmpty()) { #ifndef QT_NO_COMPRESS @@ -129,7 +132,9 @@ void QSvgIconEnginePrivate::loadDataForModeAndState(QSvgRenderer *renderer, QIco } else { QString svgFile = svgFiles.value(hashKey(mode, state)); if (svgFile.isEmpty()) - svgFile = svgFiles.value(hashKey(QIcon::Normal, QIcon::Off)); + svgFile = svgFiles.value(hashKey(QIcon::Normal, state)); + if (svgFile.isEmpty()) + svgFile = svgFiles.value(hashKey(QIcon::Normal, oppositeState)); if (!svgFile.isEmpty()) renderer->load(svgFile); } -- cgit v1.2.1 From c62344b3588f358e6dc0a7f8d67a8e85db05d8be Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 19 May 2016 13:27:18 +0200 Subject: Bump version Change-Id: Ia81f26370c94b6cbcf6a4ca284e2eed82f7cb475 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 5c42719..9665d29 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += qt_example_installs CONFIG += warning_clean -MODULE_VERSION = 5.6.1 +MODULE_VERSION = 5.6.2 -- cgit v1.2.1