diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp | 9 | ||||
| -rw-r--r-- | src/svg/doc/qtsvg.qdocconf | 8 | ||||
| -rw-r--r-- | src/svg/qsvggenerator.cpp | 1 |
3 files changed, 13 insertions, 5 deletions
diff --git a/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp b/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp index 4fd4c3a..713f2ad 100644 --- a/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp +++ b/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp @@ -122,10 +122,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 @@ -135,7 +138,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); } diff --git a/src/svg/doc/qtsvg.qdocconf b/src/svg/doc/qtsvg.qdocconf index e8460e9..b180daa 100644 --- a/src/svg/doc/qtsvg.qdocconf +++ b/src/svg/doc/qtsvg.qdocconf @@ -31,15 +31,17 @@ 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/ -examplesinstallpath = qtsvg/svg +examplesinstallpath = svg imagedirs += images diff --git a/src/svg/qsvggenerator.cpp b/src/svg/qsvggenerator.cpp index 468b97f..0abd403 100644 --- a/src/svg/qsvggenerator.cpp +++ b/src/svg/qsvggenerator.cpp @@ -798,6 +798,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); |