summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp8
-rw-r--r--src/plugins/iconengines/svgiconengine/qsvgiconengine.h1
-rw-r--r--src/svg/qsvghandler.cpp2
3 files changed, 10 insertions, 1 deletions
diff --git a/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp b/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp
index 2644326..734f4bb 100644
--- a/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp
+++ b/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp
@@ -375,6 +375,14 @@ bool QSvgIconEngine::write(QDataStream &out) const
return true;
}
+void QSvgIconEngine::virtual_hook(int id, void *data)
+{
+ if (id == QIconEngine::IsNullHook) {
+ *reinterpret_cast<bool*>(data) = d->svgFiles.isEmpty() && !d->addedPixmaps;
+ }
+ QIconEngine::virtual_hook(id, data);
+}
+
QT_END_NAMESPACE
#endif // QT_NO_SVGRENDERER
diff --git a/src/plugins/iconengines/svgiconengine/qsvgiconengine.h b/src/plugins/iconengines/svgiconengine/qsvgiconengine.h
index cf4f255..672828c 100644
--- a/src/plugins/iconengines/svgiconengine/qsvgiconengine.h
+++ b/src/plugins/iconengines/svgiconengine/qsvgiconengine.h
@@ -70,6 +70,7 @@ public:
bool read(QDataStream &in) override;
bool write(QDataStream &out) const override;
+ void virtual_hook(int id, void *data) override;
private:
QSharedDataPointer<QSvgIconEnginePrivate> d;
};
diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
index 022afb6..6c0e742 100644
--- a/src/svg/qsvghandler.cpp
+++ b/src/svg/qsvghandler.cpp
@@ -2201,7 +2201,7 @@ static inline QSvgNode::DisplayMode displayStringToEnum(const QString &str)
return QSvgNode::TableMode;
} else if (str == QLatin1String("inline-table")) {
return QSvgNode::InlineTableMode;
- } else if (str == QLatin1String("table-row")) {
+ } else if (str == QLatin1String("table-row-group")) {
return QSvgNode::TableRowGroupMode;
} else if (str == QLatin1String("table-header-group")) {
return QSvgNode::TableHeaderGroupMode;