summaryrefslogtreecommitdiffstats
path: root/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp')
-rw-r--r--src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp b/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp
index c7249d3..3273513 100644
--- a/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp
+++ b/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp
@@ -122,16 +122,10 @@ QSize QSvgIconEngine::actualSize(const QSize &size, QIcon::Mode mode,
return size;
}
- QSvgRenderer renderer;
- d->loadDataForModeAndState(&renderer, mode, state);
- if (renderer.isValid()) {
- QSize defaultSize = renderer.defaultSize();
- if (!defaultSize.isNull())
- defaultSize.scale(size, Qt::KeepAspectRatio);
- return defaultSize;
- } else {
+ QPixmap pm = pixmap(size, mode, state);
+ if (pm.isNull())
return QSize();
- }
+ return pm.size();
}
void QSvgIconEnginePrivate::loadDataForModeAndState(QSvgRenderer *renderer, QIcon::Mode mode, QIcon::State state)
'content'>
Commit message (Expand)AuthorAgeFilesLines
...
* | | [svn-r26177] Snapshot version 1.9 release 214HDF Tester2015-02-153-3/+3
* | | [svn-r26172] Fix for: HDFFV-8685 -- Have one include file to use for HL li...Scot Breitenfeld2015-02-137-7/+1
* | | [svn-r26170] Fix for HDFFV-8559Scot Breitenfeld2015-02-134-1/+146
* | | [svn-r26146] Snapshot version 1.9 release 213HDF Tester2015-02-083-3/+3
| |/ |/|
* | [svn-r26092] Snapshot version 1.9 release 212HDF Tester2015-02-013-3/+3
* | [svn-r26040] HDFFV-9018: Install pdb files to bin folder with dlls.Allen Byrne2015-01-263-4/+4
|/
* [svn-r25981] Snapshot version 1.9 release 211HDF Tester2015-01-183-3/+3
* [svn-r25975] Snapshot version 1.9 release 210HDF Tester2015-01-113-3/+3
* [svn-r25949] Snapshot version 1.9 release 209HDF Tester2015-01-043-3/+3
* [svn-r25924] Snapshot version 1.9 release 208HDF Tester2014-12-283-3/+3
* [svn-r25915] Snapshot version 1.9 release 207HDF Tester2014-12-213-3/+3
* [svn-r25886] Snapshot version 1.9 release 206HDF Tester2014-12-143-3/+3
* [svn-r25864] Snapshot version 1.9 release 205HDF Tester2014-12-073-3/+3
* [svn-r25855] Snapshot version 1.9 release 204HDF Tester2014-11-303-3/+3
* [svn-r25834] Snapshot version 1.9 release 203HDF Tester2014-11-233-3/+3
* [svn-r25762] Snapshot version 1.9 release 202HDF Tester2014-11-023-3/+3
* [svn-r25755] Removed spurious casts in a few HDfree() statements.Dana Robinson2014-10-311-3/+3
* [svn-r25736] Snapshot version 1.9 release 201HDF Tester2014-10-263-3/+3
* [svn-r25720] Snapshot version 1.9 release 200HDF Tester2014-10-193-3/+3
* [svn-r25693] Snapshot version 1.9 release 199HDF Tester2014-10-123-3/+9
* [svn-r25668] Snapshot version 1.9 release 198HDF Tester2014-10-053-3/+3
* [svn-r25631] Fix fo HDFFV-8912Scot Breitenfeld2014-09-293-6/+30
* [svn-r25629] Fix for hdffv-8855.Scot Breitenfeld2014-09-29