summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel
diff options
context:
space:
mode:
authorLars Schmertmann <Lars.Schmertmann@governikus.de>2020-06-27 14:18:09 +0200
committerLars Schmertmann <Lars.Schmertmann@governikus.de>2020-07-07 11:51:48 +0200
commit6ce2f3f26bf08b4c6952f492a3731eb4fe5a42bc (patch)
tree727427eb4c603e74954d4da462484ea7bf5c65bb /src/corelib/kernel
parentd9cc1499954829faf9486fb72056e29f1bad58e3 (diff)
Add ; to Q_UNUSED
This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: I3f0b6717956ca8fa486bed9817b89dfa19f5e0e1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r--src/corelib/kernel/qcoreapplication.cpp4
-rw-r--r--src/corelib/kernel/qjnionload.cpp2
-rw-r--r--src/corelib/kernel/qmetatype.h2
-rw-r--r--src/corelib/kernel/qproperty.h2
-rw-r--r--src/corelib/kernel/qtimerinfo_unix.cpp2
5 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 2894e1a731..7c47e324f5 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -2237,8 +2237,8 @@ bool QCoreApplicationPrivate::isTranslatorInstalled(QTranslator *translator)
QString QCoreApplication::translate(const char *context, const char *sourceText,
const char *disambiguation, int n)
{
- Q_UNUSED(context)
- Q_UNUSED(disambiguation)
+ Q_UNUSED(context);
+ Q_UNUSED(disambiguation);
QString ret = QString::fromUtf8(sourceText);
if (n >= 0)
ret.replace(QLatin1String("%n"), QString::number(n));
diff --git a/src/corelib/kernel/qjnionload.cpp b/src/corelib/kernel/qjnionload.cpp
index 0550b86553..4b2480ff2a 100644
--- a/src/corelib/kernel/qjnionload.cpp
+++ b/src/corelib/kernel/qjnionload.cpp
@@ -46,7 +46,7 @@ static const char logTag[] = "QtCore";
Q_CORE_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved)
{
- Q_UNUSED(reserved)
+ Q_UNUSED(reserved);
static bool initialized = false;
if (initialized)
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h
index 90241854fb..335b958c18 100644
--- a/src/corelib/kernel/qmetatype.h
+++ b/src/corelib/kernel/qmetatype.h
@@ -747,7 +747,7 @@ template <typename T, bool Accepted = true>
struct QMetaTypeFunctionHelper {
static void Destruct(void *t)
{
- Q_UNUSED(t) // Silence MSVC that warns for POD types.
+ Q_UNUSED(t); // Silence MSVC that warns for POD types.
static_cast<T*>(t)->~T();
}
diff --git a/src/corelib/kernel/qproperty.h b/src/corelib/kernel/qproperty.h
index de08a71349..4a323fe8fe 100644
--- a/src/corelib/kernel/qproperty.h
+++ b/src/corelib/kernel/qproperty.h
@@ -208,7 +208,7 @@ namespace Qt {
return QPropertyBinding<std::invoke_result_t<Functor>>(std::forward<Functor>(f), location);
}
// Work around bogus warning
- Q_UNUSED(QtPrivate::is_variant_v<bool>)
+ Q_UNUSED(QtPrivate::is_variant_v<bool>);
}
}
diff --git a/src/corelib/kernel/qtimerinfo_unix.cpp b/src/corelib/kernel/qtimerinfo_unix.cpp
index b425ca3dcb..af880ef522 100644
--- a/src/corelib/kernel/qtimerinfo_unix.cpp
+++ b/src/corelib/kernel/qtimerinfo_unix.cpp
@@ -116,7 +116,7 @@ timespec qAbsTimespec(const timespec &t)
bool QTimerInfoList::timeChanged(timespec *delta)
{
#ifdef Q_OS_NACL
- Q_UNUSED(delta)
+ Q_UNUSED(delta);
return false; // Calling "times" crashes.
#endif
struct tms unused;