summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Schmertmann <Lars.Schmertmann@governikus.de>2020-06-17 19:45:59 +0200
committerLars Schmertmann <lars.schmertmann@governikus.de>2020-06-23 18:31:48 +0000
commit45f516211cafac0ff18078367692c873938dc025 (patch)
treeda8f20cb98cd09f419c672b047a1042a1bcdc36c
parent9a0d4ff631003a84205c61bd7a6ef843207f1675 (diff)
downloadqtsvg-45f516211cafac0ff18078367692c873938dc025.tar.gz
Add ; to Q_UNUSED
This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: I24cc0f6735ddd8fb2444bc3bb4e7b202e8bbb43f Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
-rw-r--r--examples/svg/embeddedsvgviewer/embeddedsvgviewer.cpp2
-rw-r--r--src/svg/qsvghandler.cpp10
2 files changed, 6 insertions, 6 deletions
diff --git a/examples/svg/embeddedsvgviewer/embeddedsvgviewer.cpp b/examples/svg/embeddedsvgviewer/embeddedsvgviewer.cpp
index 89ae10a..f7d5cf0 100644
--- a/examples/svg/embeddedsvgviewer/embeddedsvgviewer.cpp
+++ b/examples/svg/embeddedsvgviewer/embeddedsvgviewer.cpp
@@ -85,7 +85,7 @@ EmbeddedSvgViewer::EmbeddedSvgViewer(const QString &filePath)
void EmbeddedSvgViewer::paintEvent(QPaintEvent *event)
{
- Q_UNUSED(event)
+ Q_UNUSED(event);
QPainter painter(this);
m_renderer->setViewBox(m_viewBox);
m_renderer->render(&painter);
diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
index 3d997f1..e8f7844 100644
--- a/src/svg/qsvghandler.cpp
+++ b/src/svg/qsvghandler.cpp
@@ -3232,8 +3232,8 @@ static bool parseStyleNode(QSvgNode *parent,
{
Q_UNUSED(parent);
#ifdef QT_NO_CSSPARSER
- Q_UNUSED(attributes)
- Q_UNUSED(handler)
+ Q_UNUSED(attributes);
+ Q_UNUSED(handler);
#else
const QStringRef type = attributes.value(QLatin1String("type"));
if (type.compare(QLatin1String("text/css"), Qt::CaseInsensitive) == 0 || type.isNull())
@@ -3850,7 +3850,7 @@ bool QSvgHandler::endElement(const QStringRef &localName)
}
#ifdef QT_NO_CSSPARSER
- Q_UNUSED(localName)
+ Q_UNUSED(localName);
#else
if (m_inStyle && localName == QLatin1String("style"))
m_inStyle = false;
@@ -4028,8 +4028,8 @@ QSvgStyleSelector * QSvgHandler::selector() const
bool QSvgHandler::processingInstruction(const QString &target, const QString &data)
{
#ifdef QT_NO_CSSPARSER
- Q_UNUSED(target)
- Q_UNUSED(data)
+ Q_UNUSED(target);
+ Q_UNUSED(data);
#else
if (target == QLatin1String("xml-stylesheet")) {
QRegularExpression rx(QLatin1String("type=\\\"(.+)\\\""),