diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:45:27 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:46:02 +0100 |
| commit | 4366fe95477f96489f9a7a99df96230f0ac72112 (patch) | |
| tree | 11f27fe83fca4805c89fe9c465cefb664290ae51 /src | |
| parent | 8c8ca4a03a701b046990f9023487888d96d113e2 (diff) | |
| parent | 275bd8a4a76256e889cad1ea88c4b5d3acb9ad8f (diff) | |
| download | qtsvg-4366fe95477f96489f9a7a99df96230f0ac72112.tar.gz | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
Change-Id: I2d1692e18205aa86e7181d907eac21dc096744ae
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp b/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp index 734f4bb..0c54e0e 100644 --- a/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp +++ b/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp @@ -378,7 +378,7 @@ bool QSvgIconEngine::write(QDataStream &out) const void QSvgIconEngine::virtual_hook(int id, void *data) { if (id == QIconEngine::IsNullHook) { - *reinterpret_cast<bool*>(data) = d->svgFiles.isEmpty() && !d->addedPixmaps; + *reinterpret_cast<bool*>(data) = d->svgFiles.isEmpty() && !d->addedPixmaps && (!d->svgBuffers || d->svgBuffers->isEmpty()); } QIconEngine::virtual_hook(id, data); } |