aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLars Schmertmann <Lars.Schmertmann@governikus.de>2020-06-27 12:57:47 +0200
committerLars Schmertmann <Lars.Schmertmann@governikus.de>2020-06-30 10:25:27 +0200
commitd9f60a2560143008336439ebc8a9399cd5bda7b4 (patch)
tree918bfc2dbba865088c7a4ec8127082635a2cef38 /src
parentd49bb8884d6d1a26fa4beb9ca2d4869db48368a5 (diff)
Add ; to Q_UNUSED
This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: I92ef02ede041d3965151165a479a1ea0549cc0f9 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/imports/platform/widgets/qwidgetplatform_p.h4
-rw-r--r--src/quickcontrols2/qquickstyleplugin.cpp2
-rw-r--r--src/quicktemplates2/qquickapplicationwindow.cpp6
-rw-r--r--src/quicktemplates2/qquickcontrol.cpp10
-rw-r--r--src/quicktemplates2/qquickheaderview.cpp4
-rw-r--r--src/quicktemplates2/qquicklabel.cpp2
-rw-r--r--src/quicktemplates2/qquickpane.cpp4
-rw-r--r--src/quicktemplates2/qquicktextfield.cpp2
8 files changed, 17 insertions, 17 deletions
diff --git a/src/imports/platform/widgets/qwidgetplatform_p.h b/src/imports/platform/widgets/qwidgetplatform_p.h
index c203406c..cbdaa24a 100644
--- a/src/imports/platform/widgets/qwidgetplatform_p.h
+++ b/src/imports/platform/widgets/qwidgetplatform_p.h
@@ -111,8 +111,8 @@ namespace QWidgetPlatform
if (available)
return new T(parent);
#else
- Q_UNUSED(parent)
- Q_UNUSED(available)
+ Q_UNUSED(parent);
+ Q_UNUSED(available);
#endif
return nullptr;
}
diff --git a/src/quickcontrols2/qquickstyleplugin.cpp b/src/quickcontrols2/qquickstyleplugin.cpp
index c35c8735..9bbaad11 100644
--- a/src/quickcontrols2/qquickstyleplugin.cpp
+++ b/src/quickcontrols2/qquickstyleplugin.cpp
@@ -63,7 +63,7 @@ QString QQuickStylePlugin::name() const
void QQuickStylePlugin::initializeTheme(QQuickTheme *theme)
{
- Q_UNUSED(theme)
+ Q_UNUSED(theme);
}
void QQuickStylePlugin::unregisterTypes()
diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp
index dda1b973..3d39a04e 100644
--- a/src/quicktemplates2/qquickapplicationwindow.cpp
+++ b/src/quicktemplates2/qquickapplicationwindow.cpp
@@ -229,9 +229,9 @@ void QQuickApplicationWindowPrivate::relayout()
void QQuickApplicationWindowPrivate::itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &diff)
{
- Q_UNUSED(item)
- Q_UNUSED(change)
- Q_UNUSED(diff)
+ Q_UNUSED(item);
+ Q_UNUSED(change);
+ Q_UNUSED(diff);
relayout();
}
diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp
index c5a5fd7a..8463c60d 100644
--- a/src/quicktemplates2/qquickcontrol.cpp
+++ b/src/quicktemplates2/qquickcontrol.cpp
@@ -1442,7 +1442,7 @@ void QQuickControl::setHoverEnabled(bool enabled)
d->updateHoverEnabled(enabled, true); // explicit=true
#else
- Q_UNUSED(enabled)
+ Q_UNUSED(enabled);
#endif
}
@@ -2154,7 +2154,7 @@ void QQuickControl::maybeSetAccessibleName(const QString &name)
accessibleAttached->setNameImplicitly(name);
}
#else
- Q_UNUSED(name)
+ Q_UNUSED(name);
#endif
}
@@ -2164,7 +2164,7 @@ QVariant QQuickControl::accessibleProperty(const char *propertyName)
if (QAccessible::isActive())
return QQuickAccessibleAttached::property(this, propertyName);
#endif
- Q_UNUSED(propertyName)
+ Q_UNUSED(propertyName);
return QVariant();
}
@@ -2174,8 +2174,8 @@ bool QQuickControl::setAccessibleProperty(const char *propertyName, const QVaria
if (QAccessible::isActive())
return QQuickAccessibleAttached::setProperty(this, propertyName, value);
#endif
- Q_UNUSED(propertyName)
- Q_UNUSED(value)
+ Q_UNUSED(propertyName);
+ Q_UNUSED(value);
return false;
}
diff --git a/src/quicktemplates2/qquickheaderview.cpp b/src/quicktemplates2/qquickheaderview.cpp
index 85291bcb..8593fa0f 100644
--- a/src/quicktemplates2/qquickheaderview.cpp
+++ b/src/quicktemplates2/qquickheaderview.cpp
@@ -360,7 +360,7 @@ QModelIndex QHeaderDataProxyModel::index(int row, int column, const QModelIndex
QModelIndex QHeaderDataProxyModel::parent(const QModelIndex &child) const
{
- Q_UNUSED(child)
+ Q_UNUSED(child);
return QModelIndex();
}
@@ -401,7 +401,7 @@ bool QHeaderDataProxyModel::setData(const QModelIndex &index, const QVariant &va
bool QHeaderDataProxyModel::hasChildren(const QModelIndex &parent) const
{
- Q_UNUSED(parent)
+ Q_UNUSED(parent);
return false;
}
diff --git a/src/quicktemplates2/qquicklabel.cpp b/src/quicktemplates2/qquicklabel.cpp
index f8c1c489..144d2fe7 100644
--- a/src/quicktemplates2/qquicklabel.cpp
+++ b/src/quicktemplates2/qquicklabel.cpp
@@ -213,7 +213,7 @@ void QQuickLabelPrivate::textChanged(const QString &text)
#if QT_CONFIG(accessibility)
maybeSetAccessibleName(text);
#else
- Q_UNUSED(text)
+ Q_UNUSED(text);
#endif
}
diff --git a/src/quicktemplates2/qquickpane.cpp b/src/quicktemplates2/qquickpane.cpp
index bf902b6b..ecdc27db 100644
--- a/src/quicktemplates2/qquickpane.cpp
+++ b/src/quicktemplates2/qquickpane.cpp
@@ -410,8 +410,8 @@ void QQuickPane::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem)
void QQuickPane::contentSizeChange(const QSizeF &newSize, const QSizeF &oldSize)
{
- Q_UNUSED(newSize)
- Q_UNUSED(oldSize)
+ Q_UNUSED(newSize);
+ Q_UNUSED(oldSize);
}
#if QT_CONFIG(accessibility)
diff --git a/src/quicktemplates2/qquicktextfield.cpp b/src/quicktemplates2/qquicktextfield.cpp
index 0dcebb40..c8e61094 100644
--- a/src/quicktemplates2/qquicktextfield.cpp
+++ b/src/quicktemplates2/qquicktextfield.cpp
@@ -309,7 +309,7 @@ void QQuickTextFieldPrivate::echoModeChanged(QQuickTextField::EchoMode echoMode)
if (QQuickAccessibleAttached *accessibleAttached = QQuickControlPrivate::accessibleAttached(q_func()))
accessibleAttached->set_passwordEdit((echoMode == QQuickTextField::Password || echoMode == QQuickTextField::PasswordEchoOnEdit) ? true : false);
#else
- Q_UNUSED(echoMode)
+ Q_UNUSED(echoMode);
#endif
}