Avoid warning on empty expressions

For some reason, Q_UNUSED includes already a semicolon, adding one
on the user side creates an additional empty statement.

Change-Id: I9c5e8fac381345a60792cb75e2938fd53958d3b0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

5 files changed, 14 insertions, 14 deletions

diff --git a/src/tools/iostool/iosdevicemanager.cpp b/src/tools/iostool/iosdevicemanager.cpp
index 53a9fd1625..f4a7fe08b9 100644
--- a/src/tools/iostool/iosdevicemanager.cpp
+++ b/src/tools/iostool/iosdevicemanager.cpp
@@ -1297,8 +1297,8 @@ void CommandSession::reportProgress(CFDictionaryRef dict)
 
 void CommandSession::reportProgress2(int progress, const QString &status)
 {
-    Q_UNUSED(progress);
-    Q_UNUSED(status);
+    Q_UNUSED(progress)
+    Q_UNUSED(status)
 }
 
 QString CommandSession::commandName()
diff --git a/src/tools/iostool/main.cpp b/src/tools/iostool/main.cpp
index f62c0c6180..328956e971 100644
--- a/src/tools/iostool/main.cpp
+++ b/src/tools/iostool/main.cpp
@@ -657,8 +657,8 @@ void IosTool::doExit(int errorCode)
 void IosTool::isTransferringApp(const QString &bundlePath, const QString &deviceId, int progress,
                                 const QString &info)
 {
-    Q_UNUSED(bundlePath);
-    Q_UNUSED(deviceId);
+    Q_UNUSED(bundlePath)
+    Q_UNUSED(deviceId)
     QMutexLocker l(&m_xmlMutex);
     out.writeStartElement(QLatin1String("status"));
     out.writeAttribute(QLatin1String("progress"), QString::number(progress));
@@ -671,8 +671,8 @@ void IosTool::isTransferringApp(const QString &bundlePath, const QString &device
 void IosTool::didTransferApp(const QString &bundlePath, const QString &deviceId,
                              Ios::IosDeviceManager::OpStatus status)
 {
-    Q_UNUSED(bundlePath);
-    Q_UNUSED(deviceId);
+    Q_UNUSED(bundlePath)
+    Q_UNUSED(deviceId)
     {
         QMutexLocker l(&m_xmlMutex);
         if (status == Ios::IosDeviceManager::Success) {
@@ -698,8 +698,8 @@ void IosTool::didStartApp(const QString &bundlePath, const QString &deviceId,
                           Ios::IosDeviceManager::OpStatus status, int gdbFd,
                           Ios::DeviceSession *deviceSession)
 {
-    Q_UNUSED(bundlePath);
-    Q_UNUSED(deviceId);
+    Q_UNUSED(bundlePath)
+    Q_UNUSED(deviceId)
     {
         QMutexLocker l(&m_xmlMutex);
         out.writeEmptyElement(QLatin1String("app_started"));
@@ -811,7 +811,7 @@ void IosTool::writeMaybeBin(const QString &extraMsg, const char *msg, quintptr l
 
 void IosTool::deviceInfo(const QString &deviceId, const Ios::IosDeviceManager::Dict &devInfo)
 {
-    Q_UNUSED(deviceId);
+    Q_UNUSED(deviceId)
     {
         QMutexLocker l(&m_xmlMutex);
         out.writeTextElement(QLatin1String("device_id"), deviceId);
diff --git a/src/tools/qtcreatorcrashhandler/crashhandlersetup.cpp b/src/tools/qtcreatorcrashhandler/crashhandlersetup.cpp
index fd24e6b543..1cfd8d7b59 100644
--- a/src/tools/qtcreatorcrashhandler/crashhandlersetup.cpp
+++ b/src/tools/qtcreatorcrashhandler/crashhandlersetup.cpp
@@ -154,9 +154,9 @@ CrashHandlerSetup::CrashHandlerSetup(const QString &appName,
         }
     }
 #else
-    Q_UNUSED(appName);
-    Q_UNUSED(restartCap);
-    Q_UNUSED(executableDirPath);
+    Q_UNUSED(appName)
+    Q_UNUSED(restartCap)
+    Q_UNUSED(executableDirPath)
 #endif // BUILD_CRASH_HANDLER
 }
 
diff --git a/src/tools/sdktool/addtoolchainoperation.cpp b/src/tools/sdktool/addtoolchainoperation.cpp
index afcab9a5e2..a5be70e877 100644
--- a/src/tools/sdktool/addtoolchainoperation.cpp
+++ b/src/tools/sdktool/addtoolchainoperation.cpp
@@ -264,7 +264,7 @@ QVariantMap AddToolChainOperation::addToolChain(const QVariantMap &map, const QS
     QString newLang; // QtC 4.3 and later
     QString oldLang; // QtC 4.2
     int langInt = lang.toInt(&ok);
-    Q_UNUSED(langInt);
+    Q_UNUSED(langInt)
     if (lang == "2" || lang == "Cxx") {
         newLang = "Cxx";
         oldLang = "2";
diff --git a/src/tools/valgrindfake/outputgenerator.cpp b/src/tools/valgrindfake/outputgenerator.cpp
index d2c944dac7..4aec9ae9e1 100644
--- a/src/tools/valgrindfake/outputgenerator.cpp
+++ b/src/tools/valgrindfake/outputgenerator.cpp
@@ -107,7 +107,7 @@ void OutputGenerator::produceRuntimeError()
 #ifndef __clang_analyzer__
         int zero = 0; // hide the error at compile-time to avoid a compiler warning
         int i = 1 / zero;
-        Q_UNUSED(i);
+        Q_UNUSED(i)
 #endif
         Q_ASSERT(false);
     } else if (m_garbage) {