Add ; to Q_UNUSED

This is required to remove the ; from the macro with Qt 6.

Task-number: QTBUG-82978
Change-Id: Ie8bdf9b2100826beb2bdb0934d3f36e6a8df13a6
Reviewed-by: Alberto Mardegan <mardy@users.sourceforge.net>
Reviewed-by: Christopher Adams <chris.adams@jolla.com>

29 files changed, 198 insertions, 198 deletions

diff --git a/src/contacts/doc/snippets/multiaction/multiaction.cpp b/src/contacts/doc/snippets/multiaction/multiaction.cpp
index c6624a04f..2411cfaab 100644
--- a/src/contacts/doc/snippets/multiaction/multiaction.cpp
+++ b/src/contacts/doc/snippets/multiaction/multiaction.cpp
@@ -145,8 +145,8 @@ QContactFilter QContactMultiActionFactory::contactFilter(const QContactActionDes
 
 QVariant QContactMultiActionFactory::metaData(const QString& key, const QList<QContactActionTarget>& targets, const QVariantMap& parameters, const QContactActionDescriptor& which) const
 {
-    Q_UNUSED(targets)
-    Q_UNUSED(parameters)
+    Q_UNUSED(targets);
+    Q_UNUSED(parameters);
 
     if (key == QContactActionDescriptor::MetaDataLabel)
         return QString("Call with VoIP");
@@ -179,7 +179,7 @@ QContactActionOne::~QContactActionOne()
 
 bool QContactActionOne::invokeAction(const QContactActionTarget& target, const QVariantMap& params)
 {
-    Q_UNUSED(params)
+    Q_UNUSED(params);
     // this action only works on (contact + phone number) targets.
     if (target.details().size() > 1 || target.details().at(0).definitionName() != QContactPhoneNumber::DefinitionName)
         return false;
@@ -190,7 +190,7 @@ bool QContactActionOne::invokeAction(const QContactActionTarget& target, const Q
 
 bool QContactActionOne::invokeAction(const QList<QContactActionTarget>& targets, const QVariantMap& params)
 {
-    Q_UNUSED(params)
+    Q_UNUSED(params);
     foreach (const QContactActionTarget& target, targets) {
         if (target.details().size() > 1 || target.details().at(0).definitionName() != QContactPhoneNumber::DefinitionName) {
             return false;
@@ -229,7 +229,7 @@ QContactActionTwo::~QContactActionTwo()
 
 bool QContactActionTwo::invokeAction(const QContactActionTarget& target, const QVariantMap& params)
 {
-    Q_UNUSED(params)
+    Q_UNUSED(params);
     // this action only works on (contact + phone number) targets.  Note that it doesn't
     // have to be the same as QContactActionOne -- it could have an entirely different implementation!
     if (target.details().size() > 1 || target.details().at(0).definitionName() != QContactPhoneNumber::DefinitionName)
@@ -241,7 +241,7 @@ bool QContactActionTwo::invokeAction(const QContactActionTarget& target, const Q
 
 bool QContactActionTwo::invokeAction(const QList<QContactActionTarget>& targets, const QVariantMap& params)
 {
-    Q_UNUSED(params)
+    Q_UNUSED(params);
     foreach (const QContactActionTarget& target, targets) {
         if (target.details().size() > 1 || target.details().at(0).definitionName() != QContactPhoneNumber::DefinitionName) {
             return false;
diff --git a/src/contacts/filters/qcontactinvalidfilter.cpp b/src/contacts/filters/qcontactinvalidfilter.cpp
index 1a8d163da..210296c94 100644
--- a/src/contacts/filters/qcontactinvalidfilter.cpp
+++ b/src/contacts/filters/qcontactinvalidfilter.cpp
@@ -69,13 +69,13 @@ public:
 
     QDataStream& outputToStream(QDataStream& stream, quint8 formatVersion) const
     {
-        Q_UNUSED(formatVersion)
+        Q_UNUSED(formatVersion);
         return stream;
     }
 
     QDataStream& inputFromStream(QDataStream& stream, quint8 formatVersion)
     {
-        Q_UNUSED(formatVersion)
+        Q_UNUSED(formatVersion);
         return stream;
     }
 
diff --git a/src/imports/contacts/plugin.cpp b/src/imports/contacts/plugin.cpp
index 61cbab946..d6745ad00 100644
--- a/src/imports/contacts/plugin.cpp
+++ b/src/imports/contacts/plugin.cpp
@@ -130,8 +130,8 @@ public:
 
     void initializeEngine(QQmlEngine *engine, const char *uri)
     {
-        Q_UNUSED(engine)
-        Q_UNUSED(uri)
+        Q_UNUSED(engine);
+        Q_UNUSED(uri);
     }
 };
 
diff --git a/src/organizer/filters/qorganizeriteminvalidfilter.cpp b/src/organizer/filters/qorganizeriteminvalidfilter.cpp
index 9dfd6bd27..9ab6b35f9 100644
--- a/src/organizer/filters/qorganizeriteminvalidfilter.cpp
+++ b/src/organizer/filters/qorganizeriteminvalidfilter.cpp
@@ -68,13 +68,13 @@ public:
 #ifndef QT_NO_DATASTREAM
     QDataStream &outputToStream(QDataStream &stream, quint8 formatVersion) const
     {
-        Q_UNUSED(formatVersion)
+        Q_UNUSED(formatVersion);
         return stream;
     }
 
     QDataStream &inputFromStream(QDataStream &stream, quint8 formatVersion)
     {
-        Q_UNUSED(formatVersion)
+        Q_UNUSED(formatVersion);
         return stream;
     }
 #endif // QT_NO_DATASTREAM
diff --git a/src/organizer/qorganizermanagerengine.cpp b/src/organizer/qorganizermanagerengine.cpp
index 1adaafed8..a4368a3e6 100644
--- a/src/organizer/qorganizermanagerengine.cpp
+++ b/src/organizer/qorganizermanagerengine.cpp
@@ -310,10 +310,10 @@ QList<QOrganizerItemId> QOrganizerManagerEngine::itemIds(const QOrganizerItemFil
                                                          const QList<QOrganizerItemSortOrder> &sortOrders,
                                                          QOrganizerManager::Error *error)
 {
-    Q_UNUSED(startDateTime)
-    Q_UNUSED(endDateTime)
-    Q_UNUSED(filter)
-    Q_UNUSED(sortOrders)
+    Q_UNUSED(startDateTime);
+    Q_UNUSED(endDateTime);
+    Q_UNUSED(filter);
+    Q_UNUSED(sortOrders);
 
     *error = QOrganizerManager::NotSupportedError;
     return QList<QOrganizerItemId>();
@@ -344,12 +344,12 @@ QList<QOrganizerItem> QOrganizerManagerEngine::items(const QOrganizerItemFilter
                                                      const QList<QOrganizerItemSortOrder> &sortOrders,
                                                      const QOrganizerItemFetchHint &fetchHint, QOrganizerManager::Error *error)
 {
-    Q_UNUSED(filter)
-    Q_UNUSED(startDateTime)
-    Q_UNUSED(endDateTime)
-    Q_UNUSED(maxCount)
-    Q_UNUSED(sortOrders)
-    Q_UNUSED(fetchHint)
+    Q_UNUSED(filter);
+    Q_UNUSED(startDateTime);
+    Q_UNUSED(endDateTime);
+    Q_UNUSED(maxCount);
+    Q_UNUSED(sortOrders);
+    Q_UNUSED(fetchHint);
 
     *error = QOrganizerManager::NotSupportedError;
     return QList<QOrganizerItem>();
@@ -383,11 +383,11 @@ QList<QOrganizerItem> QOrganizerManagerEngine::itemsForExport(const QDateTime &s
                                                               const QOrganizerItemFetchHint &fetchHint,
                                                               QOrganizerManager::Error *error)
 {
-    Q_UNUSED(startDateTime)
-    Q_UNUSED(endDateTime)
-    Q_UNUSED(filter)
-    Q_UNUSED(sortOrders)
-    Q_UNUSED(fetchHint)
+    Q_UNUSED(startDateTime);
+    Q_UNUSED(endDateTime);
+    Q_UNUSED(filter);
+    Q_UNUSED(sortOrders);
+    Q_UNUSED(fetchHint);
 
     *error = QOrganizerManager::NotSupportedError;
     return QList<QOrganizerItem>();
@@ -411,9 +411,9 @@ QList<QOrganizerItem> QOrganizerManagerEngine::itemsForExport(const QDateTime &s
 QList<QOrganizerItem> QOrganizerManagerEngine::items(const QList<QOrganizerItemId> &itemIds, const QOrganizerItemFetchHint &fetchHint,
                                                      QMap<int, QOrganizerManager::Error> *errorMap, QOrganizerManager::Error *error)
 {
-    Q_UNUSED(itemIds)
-    Q_UNUSED(fetchHint)
-    Q_UNUSED(errorMap)
+    Q_UNUSED(itemIds);
+    Q_UNUSED(fetchHint);
+    Q_UNUSED(errorMap);
 
     *error = QOrganizerManager::NotSupportedError;
     return QList<QOrganizerItem>();
@@ -434,7 +434,7 @@ QList<QOrganizerItemFilter::FilterType> QOrganizerManagerEngine::supportedFilter
  */
 QList<QOrganizerItemDetail::DetailType> QOrganizerManagerEngine::supportedItemDetails(QOrganizerItemType::ItemType itemType) const
 {
-    Q_UNUSED(itemType)
+    Q_UNUSED(itemType);
     return QList<QOrganizerItemDetail::DetailType>();
 }
 
@@ -473,9 +473,9 @@ QList<QOrganizerItemType::ItemType> QOrganizerManagerEngine::supportedItemTypes(
 bool QOrganizerManagerEngine::saveItems(QList<QOrganizerItem> *items, const QList<QOrganizerItemDetail::DetailType> &detailMask,
                                         QMap<int, QOrganizerManager::Error> *errorMap, QOrganizerManager::Error *error)
 {
-    Q_UNUSED(items)
-    Q_UNUSED(detailMask)
-    Q_UNUSED(errorMap)
+    Q_UNUSED(items);
+    Q_UNUSED(detailMask);
+    Q_UNUSED(errorMap);
 
     *error = QOrganizerManager::NotSupportedError;
     return false;
@@ -495,8 +495,8 @@ bool QOrganizerManagerEngine::saveItems(QList<QOrganizerItem> *items, const QLis
 bool QOrganizerManagerEngine::removeItems(const QList<QOrganizerItemId> &itemIds, QMap<int, QOrganizerManager::Error> *errorMap,
                                           QOrganizerManager::Error *error)
 {
-    Q_UNUSED(itemIds)
-    Q_UNUSED(errorMap)
+    Q_UNUSED(itemIds);
+    Q_UNUSED(errorMap);
 
     *error = QOrganizerManager::NotSupportedError;
     return false;
@@ -517,8 +517,8 @@ bool QOrganizerManagerEngine::removeItems(const QList<QOrganizerItemId> &itemIds
 bool QOrganizerManagerEngine::removeItems(const QList<QOrganizerItem> *items, QMap<int, QOrganizerManager::Error> *errorMap,
                                           QOrganizerManager::Error *error)
 {
-    Q_UNUSED(items)
-    Q_UNUSED(errorMap)
+    Q_UNUSED(items);
+    Q_UNUSED(errorMap);
 
     *error = QOrganizerManager::NotSupportedError;
     return false;
diff --git a/src/plugins/organizer/memory/qorganizeritemmemorybackend.cpp b/src/plugins/organizer/memory/qorganizeritemmemorybackend.cpp
index fe997ab3b..a9545b2c2 100644
--- a/src/plugins/organizer/memory/qorganizeritemmemorybackend.cpp
+++ b/src/plugins/organizer/memory/qorganizeritemmemorybackend.cpp
@@ -184,7 +184,7 @@ QMap<QString, QString> QOrganizerItemMemoryEngine::idInterpretationParameters()
 QList<QOrganizerItem> QOrganizerItemMemoryEngine::items(const QList<QOrganizerItemId> &itemIds, const QOrganizerItemFetchHint &fetchHint,
                                                         QMap<int, QOrganizerManager::Error> *errorMap, QOrganizerManager::Error *error)
 {
-    Q_UNUSED(fetchHint)
+    Q_UNUSED(fetchHint);
 
     QList<QOrganizerItem> items;
     items.reserve(itemIds.size());
diff --git a/src/plugins/organizer/skeleton/qorganizerskeleton.cpp b/src/plugins/organizer/skeleton/qorganizerskeleton.cpp
index fe1ff514a..65ad696e1 100644
--- a/src/plugins/organizer/skeleton/qorganizerskeleton.cpp
+++ b/src/plugins/organizer/skeleton/qorganizerskeleton.cpp
@@ -169,10 +169,10 @@ QList<QOrganizerItem> QOrganizerItemSkeletonEngine::items(const QOrganizerItemFi
         fetch at least what is mentioned in the fetch hint).
     */
 
-    Q_UNUSED(startDateTime)
-    Q_UNUSED(endDateTime)
-    Q_UNUSED(maxCount)
-    Q_UNUSED(fetchHint)
+    Q_UNUSED(startDateTime);
+    Q_UNUSED(endDateTime);
+    Q_UNUSED(maxCount);
+    Q_UNUSED(fetchHint);
 
     *error = QOrganizerManager::NotSupportedError; // TODO <- remove this
 
@@ -419,7 +419,7 @@ QList<QOrganizerItemFilter::FilterType> QOrganizerItemSkeletonEngine::supportedF
 QList<QOrganizerItemDetail::DetailType> QOrganizerItemSkeletonEngine::supportedItemDetails(QOrganizerItemType::ItemType itemType) const
 {
     // TODO - return which [predefined] details this engine supports for this item type
-    Q_UNUSED(itemType)
+    Q_UNUSED(itemType);
 
     return QList<QOrganizerItemDetail::DetailType>();
 }
diff --git a/src/plugins/versit/backuphandler/backupvcardhandler.cpp b/src/plugins/versit/backuphandler/backupvcardhandler.cpp
index d7036468b..a71e0145a 100644
--- a/src/plugins/versit/backuphandler/backupvcardhandler.cpp
+++ b/src/plugins/versit/backuphandler/backupvcardhandler.cpp
@@ -151,19 +151,19 @@ void BackupVCardHandler::propertyProcessed(
         bool* alreadyProcessed,
         QList<QContactDetail>* updatedDetails)
 {
-    Q_UNUSED(document)
-    Q_UNUSED(property)
-    Q_UNUSED(contact)
-    Q_UNUSED(alreadyProcessed)
-    Q_UNUSED(updatedDetails)
+    Q_UNUSED(document);
+    Q_UNUSED(property);
+    Q_UNUSED(contact);
+    Q_UNUSED(alreadyProcessed);
+    Q_UNUSED(updatedDetails);
 }
 
 void BackupVCardHandler::documentProcessed(
         const QVersitDocument& document,
         QContact* contact)
 {
-    Q_UNUSED(document)
-    Q_UNUSED(contact)
+    Q_UNUSED(document);
+    Q_UNUSED(contact);
 }
 
 void BackupVCardHandler::detailProcessed(
@@ -174,9 +174,9 @@ void BackupVCardHandler::detailProcessed(
         QList<QVersitProperty>* toBeRemoved,
         QList<QVersitProperty>* toBeAdded)
 {
-    Q_UNUSED(contact)
-    Q_UNUSED(document)
-    Q_UNUSED(toBeRemoved)
+    Q_UNUSED(contact);
+    Q_UNUSED(document);
+    Q_UNUSED(toBeRemoved);
     if (detail.accessConstraints().testFlag(QContactDetail::ReadOnly))
         return;
     QMap<int, QVariant> fields = detail.values();
@@ -265,8 +265,8 @@ void BackupVCardHandler::contactProcessed(
         const QContact& contact,
         QVersitDocument* document)
 {
-    Q_UNUSED(contact)
-    Q_UNUSED(document)
+    Q_UNUSED(contact);
+    Q_UNUSED(document);
     mDetailNumber = 0;
 }
 
diff --git a/src/plugins/versit/vcardpreserver/vcardpreserver.cpp b/src/plugins/versit/vcardpreserver/vcardpreserver.cpp
index 7825bbe9c..265425d6c 100644
--- a/src/plugins/versit/vcardpreserver/vcardpreserver.cpp
+++ b/src/plugins/versit/vcardpreserver/vcardpreserver.cpp
@@ -133,8 +133,8 @@ void VCardPreserver::propertyProcessed(const QVersitDocument& document,
                                        bool* alreadyProcessed,
                                        QList<QContactDetail>* updatedDetails)
 {
-    Q_UNUSED(contact)
-    Q_UNUSED(document)
+    Q_UNUSED(contact);
+    Q_UNUSED(document);
     if (!updatedDetails->isEmpty() || *alreadyProcessed) {
         return;
     }
@@ -148,8 +148,8 @@ void VCardPreserver::propertyProcessed(const QVersitDocument& document,
 void VCardPreserver::documentProcessed(const QVersitDocument& document,
                                        QContact* contact)
 {
-    Q_UNUSED(document)
-    Q_UNUSED(contact)
+    Q_UNUSED(document);
+    Q_UNUSED(contact);
 }
 
 void VCardPreserver::detailProcessed(const QContact& contact,
@@ -159,9 +159,9 @@ void VCardPreserver::detailProcessed(const QContact& contact,
                                      QList<QVersitProperty>* toBeRemoved,
                                      QList<QVersitProperty>* toBeAdded)
 {
-    Q_UNUSED(contact)
-    Q_UNUSED(document)
-    Q_UNUSED(toBeRemoved)
+    Q_UNUSED(contact);
+    Q_UNUSED(document);
+    Q_UNUSED(toBeRemoved);
     if (detail.type() == DetailType
             && processedFields->isEmpty()) {
         QString key(detail.value(KeyField).toString());
@@ -180,8 +180,8 @@ void VCardPreserver::detailProcessed(const QContact& contact,
 void VCardPreserver::contactProcessed(const QContact& contact,
                                       QVersitDocument* document)
 {
-    Q_UNUSED(contact)
-    Q_UNUSED(document)
+    Q_UNUSED(contact);
+    Q_UNUSED(document);
 }
 
 QT_END_NAMESPACE_VERSIT
diff --git a/src/versit/doc/snippets/qtversitdocsample/qtversitdocsample.cpp b/src/versit/doc/snippets/qtversitdocsample/qtversitdocsample.cpp
index 7b3ab71fb..13ccbcb70 100644
--- a/src/versit/doc/snippets/qtversitdocsample/qtversitdocsample.cpp
+++ b/src/versit/doc/snippets/qtversitdocsample/qtversitdocsample.cpp
@@ -76,7 +76,7 @@ class MyResourceHandler : public QVersitDefaultResourceHandler {
 public:
    bool saveResource(const QByteArray& contents, const QVersitProperty& property,
                      QString* location) {
-       Q_UNUSED(property)
+       Q_UNUSED(property);
        *location = QString::number(qrand());
        QFile file(*location);
        file.open(QIODevice::WriteOnly);
@@ -93,8 +93,8 @@ public:
 #if 0
 int main(int argc, char *argv[])
 {
-    Q_UNUSED(argc)
-    Q_UNUSED(argv)
+    Q_UNUSED(argc);
+    Q_UNUSED(argv);
     completeExample();
     exportExample();
     importExample();
diff --git a/src/versit/qversitcontactimporter_p.cpp b/src/versit/qversitcontactimporter_p.cpp
index f72e273c1..ffeb963f7 100644
--- a/src/versit/qversitcontactimporter_p.cpp
+++ b/src/versit/qversitcontactimporter_p.cpp
@@ -310,7 +310,7 @@ bool QVersitContactImporterPrivate::createPhone(
     QContact* contact,
     QList<QContactDetail>* updatedDetails)
 {
-    Q_UNUSED(contact)
+    Q_UNUSED(contact);
     QContactPhoneNumber phone;
     QString value(property.value());
     if (value.isEmpty())
@@ -346,7 +346,7 @@ bool QVersitContactImporterPrivate::createAddress(
     QContact* contact,
     QList<QContactDetail>* updatedDetails)
 {
-    Q_UNUSED(contact)
+    Q_UNUSED(contact);
     QContactAddress address;
 
     QVariant variant = property.variantValue();
@@ -470,7 +470,7 @@ bool QVersitContactImporterPrivate::createTimeStamp(
     QContact* contact,
     QList<QContactDetail>* updatedDetails)
 {
-    Q_UNUSED(contact)
+    Q_UNUSED(contact);
     QContactTimestamp timeStamp;
     QString value(property.value());
     QDateTime dateTime = parseDateTime(value);
@@ -519,7 +519,7 @@ bool QVersitContactImporterPrivate::createAnniversary(
     QContact* contact,
     QList<QContactDetail>* updatedDetails)
 {
-    Q_UNUSED(contact)
+    Q_UNUSED(contact);
     QContactAnniversary anniversary;
     bool justDate = false;
     QDateTime dateTime = parseDateTime(property.value(), &justDate);
@@ -541,7 +541,7 @@ bool QVersitContactImporterPrivate::createBirthday(
     QContact* contact,
     QList<QContactDetail>* updatedDetails)
 {
-    Q_UNUSED(contact)
+    Q_UNUSED(contact);
     QContactBirthday bday;
     bool justDate = false;
     QDateTime dateTime = parseDateTime(property.value(), &justDate);
@@ -586,7 +586,7 @@ bool QVersitContactImporterPrivate::createNicknames(
     QContact* contact,
     QList<QContactDetail>* updatedDetails)
 {
-    Q_UNUSED(contact)
+    Q_UNUSED(contact);
     QVariant variant = property.variantValue();
     if (property.valueType() != QVersitProperty::ListType
             || variant.type() != QVariant::StringList)
@@ -618,7 +618,7 @@ bool QVersitContactImporterPrivate::createTags(
     QContact* contact,
     QList<QContactDetail>* updatedDetails)
 {
-    Q_UNUSED(contact)
+    Q_UNUSED(contact);
     QVariant variant = property.variantValue();
     if (property.valueType() != QVersitProperty::ListType
             || variant.type() != QVariant::StringList)
@@ -650,7 +650,7 @@ bool QVersitContactImporterPrivate::createOnlineAccount(
     QContact* contact,
     QList<QContactDetail>* updatedDetails)
 {
-    Q_UNUSED(contact)
+    Q_UNUSED(contact);
     QContactOnlineAccount onlineAccount;
     QString value(property.value());
     if (value.isEmpty())
@@ -718,7 +718,7 @@ bool QVersitContactImporterPrivate::createRingtone(
     QContact* contact,
     QList<QContactDetail>* updatedDetails)
 {
-    Q_UNUSED(contact)
+    Q_UNUSED(contact);
     QString location;
     QByteArray data;
     if (saveDataFromProperty(property, &location, &data) && !location.isEmpty()) {
@@ -738,7 +738,7 @@ bool QVersitContactImporterPrivate::createAvatar(
     QContact* contact,
     QList<QContactDetail>* updatedDetails)
 {
-    Q_UNUSED(contact)
+    Q_UNUSED(contact);
     QString location;
     QByteArray data;
     bool success = false;
@@ -760,7 +760,7 @@ bool QVersitContactImporterPrivate::createGeoLocation(
     QContact* contact,
     QList<QContactDetail>* updatedDetails)
 {
-    Q_UNUSED(contact)
+    Q_UNUSED(contact);
     QContactGeoLocation geo;
     QVariant variant = property.variantValue();
     if (property.valueType() != QVersitProperty::CompoundType
@@ -903,7 +903,7 @@ bool QVersitContactImporterPrivate::createExtendedDetail(
     QContact* contact,
     QList<QContactDetail>* updatedDetails)
 {
-    Q_UNUSED(contact)
+    Q_UNUSED(contact);
     QContactExtendedDetail extendedDetail;
     const QVariant variant = property.variantValue();
     if (property.valueType() != QVersitProperty::CompoundType
@@ -930,7 +930,7 @@ bool QVersitContactImporterPrivate::createNameValueDetail(
     QContact* contact,
     QList<QContactDetail>* updatedDetails)
 {
-    Q_UNUSED(contact)
+    Q_UNUSED(contact);
     QString value(property.value());
     if (value.isEmpty())
         return false;
diff --git a/src/versit/qversitresourcehandler.cpp b/src/versit/qversitresourcehandler.cpp
index 645d44a1c..bd55553d5 100644
--- a/src/versit/qversitresourcehandler.cpp
+++ b/src/versit/qversitresourcehandler.cpp
@@ -155,9 +155,9 @@ bool QVersitDefaultResourceHandler::saveResource(const QByteArray& contents,
                                                  const QVersitProperty& property,
                                                  QString* location)
 {
-    Q_UNUSED(contents)
-    Q_UNUSED(property)
-    Q_UNUSED(location)
+    Q_UNUSED(contents);
+    Q_UNUSED(property);
+    Q_UNUSED(location);
     return false;
 }
 
diff --git a/src/versitorganizer/qversitorganizerexporter_p.cpp b/src/versitorganizer/qversitorganizerexporter_p.cpp
index 699fe12bb..2c6aa8a59 100644
--- a/src/versitorganizer/qversitorganizerexporter_p.cpp
+++ b/src/versitorganizer/qversitorganizerexporter_p.cpp
@@ -480,7 +480,7 @@ void QVersitOrganizerExporterPrivate::encodeRecurDates(
         QList<QVersitProperty>* removedProperties,
         QList<QVersitProperty>* generatedProperties)
 {
-    Q_UNUSED(item)
+    Q_UNUSED(item);
 
     QVersitProperty property;
     property = takeProperty(document, propertyName, removedProperties);
diff --git a/tests/auto/contacts/qcontactactions/multiaction/multiaction.cpp b/tests/auto/contacts/qcontactactions/multiaction/multiaction.cpp
index e8f79680f..3d3e2b140 100644
--- a/tests/auto/contacts/qcontactactions/multiaction/multiaction.cpp
+++ b/tests/auto/contacts/qcontactactions/multiaction/multiaction.cpp
@@ -125,8 +125,8 @@ QContactFilter QContactMultiActionFactory::contactFilter(const QContactActionDes
 
 QVariant QContactMultiActionFactory::metaData(const QString& key, const QList<QContactActionTarget>& targets, const QVariantMap& parameters, const QContactActionDescriptor& which) const
 {
-    Q_UNUSED(targets)
-    Q_UNUSED(parameters)
+    Q_UNUSED(targets);
+    Q_UNUSED(parameters);
 
     if (key == QContactActionDescriptor::MetaDataLabel)
         return QString("Call with VoIP");
@@ -159,7 +159,7 @@ QContactActionOne::~QContactActionOne()
 
 bool QContactActionOne::invokeAction(const QContactActionTarget& target, const QVariantMap& params)
 {
-    Q_UNUSED(params)
+    Q_UNUSED(params);
     // this action only works on (contact + phone number) targets.
     if (target.details().size() > 1 || target.details().at(0).definitionName() != QContactPhoneNumber::DefinitionName)
         return false;
@@ -170,7 +170,7 @@ bool QContactActionOne::invokeAction(const QContactActionTarget& target, const Q
 
 bool QContactActionOne::invokeAction(const QList<QContactActionTarget>& targets, const QVariantMap& params)
 {
-    Q_UNUSED(params)
+    Q_UNUSED(params);
     foreach (const QContactActionTarget& target, targets) {
         if (target.details().size() > 1 || target.details().at(0).definitionName() != QContactPhoneNumber::DefinitionName) {
             return false;
@@ -209,7 +209,7 @@ QContactActionTwo::~QContactActionTwo()
 
 bool QContactActionTwo::invokeAction(const QContactActionTarget& target, const QVariantMap& params)
 {
-    Q_UNUSED(params)
+    Q_UNUSED(params);
     // this action only works on (contact + phone number) targets.  Note that it doesn't
     // have to be the same as QContactActionOne -- it could have an entirely different implementation!
     if (target.details().size() > 1 || target.details().at(0).definitionName() != QContactPhoneNumber::DefinitionName)
@@ -221,7 +221,7 @@ bool QContactActionTwo::invokeAction(const QContactActionTarget& target, const Q
 
 bool QContactActionTwo::invokeAction(const QList<QContactActionTarget>& targets, const QVariantMap& params)
 {
-    Q_UNUSED(params)
+    Q_UNUSED(params);
     foreach (const QContactActionTarget& target, targets) {
         if (target.details().size() > 1 || target.details().at(0).definitionName() != QContactPhoneNumber::DefinitionName) {
             return false;
diff --git a/tests/auto/contacts/qcontactmanager/tst_qcontactmanager.cpp b/tests/auto/contacts/qcontactmanager/tst_qcontactmanager.cpp
index 25663c809..247365483 100644
--- a/tests/auto/contacts/qcontactmanager/tst_qcontactmanager.cpp
+++ b/tests/auto/contacts/qcontactmanager/tst_qcontactmanager.cpp
@@ -276,7 +276,7 @@ class LazyEngineFactory : public QContactManagerEngineFactory
 QContactManagerEngine* LazyEngineFactory::engine(const QMap<QString, QString>& parameters, QContactManager::Error* error)
 {
     // Return one or the other
-    Q_UNUSED(error)
+    Q_UNUSED(error);
     if (parameters.value("version") == QString("1"))
         return new QContactLazyEngine();
     else
@@ -1817,7 +1817,7 @@ void tst_QContactManager::observerDeletion()
     QVERIFY(manager->saveContact(&c));
     QContactId id = c.id();
     QContactObserver *observer = new QContactObserver(manager, id);
-    Q_UNUSED(observer)
+    Q_UNUSED(observer);
     delete manager;
     delete observer;
     // Test for bug MOBILITY-2566 - that QContactObserver doesn't crash when it is
diff --git a/tests/auto/contacts/qcontactmanagerfiltering/testactions/booleanaction/booleanaction_p.h b/tests/auto/contacts/qcontactmanagerfiltering/testactions/booleanaction/booleanaction_p.h
index 90ca0f9e1..d118f738d 100644
--- a/tests/auto/contacts/qcontactmanagerfiltering/testactions/booleanaction/booleanaction_p.h
+++ b/tests/auto/contacts/qcontactmanagerfiltering/testactions/booleanaction/booleanaction_p.h
@@ -54,7 +54,7 @@ QTCONTACTS_USE_NAMESPACE
 class DummyAction : public QContactAction
 {
 public:
-    DummyAction(QObject* parent = nullptr) { Q_UNUSED(parent) }
+    DummyAction(QObject* parent = nullptr) { Q_UNUSED(parent); }
 
     bool invokeAction(const QContactActionTarget&, const QVariantMap&)
     {
@@ -113,13 +113,13 @@ public:
 
     QContactAction* create(const QContactActionDescriptor& which) const
     {
-        Q_UNUSED(which)
+        Q_UNUSED(which);
         return new QBooleanAction;
     }
 
     QSet<QContactActionTarget> supportedTargets(const QContact& contact, const QContactActionDescriptor& which) const
     {
-        Q_UNUSED(which)
+        Q_UNUSED(which);
 
         QSet<QContactActionTarget> retn;
         QList<QContactDetail> boolDets = contact.details("BooleanDefinition");
@@ -135,7 +135,7 @@ public:
 
     QContactFilter contactFilter(const QContactActionDescriptor& which) const
     {
-        Q_UNUSED(which)
+        Q_UNUSED(which);
 
         /* This only likes bools that are true */
         QContactDetailFilter df;
diff --git a/tests/auto/contacts/qcontactmanagerfiltering/testactions/dateaction/dateaction_p.h b/tests/auto/contacts/qcontactmanagerfiltering/testactions/dateaction/dateaction_p.h
index 8c181d183..0d0a179a0 100644
--- a/tests/auto/contacts/qcontactmanagerfiltering/testactions/dateaction/dateaction_p.h
+++ b/tests/auto/contacts/qcontactmanagerfiltering/testactions/dateaction/dateaction_p.h
@@ -54,7 +54,7 @@ QTCONTACTS_USE_NAMESPACE
 class DummyAction : public QContactAction
 {
 public:
-    DummyAction(QObject* parent = nullptr) { Q_UNUSED(parent) }
+    DummyAction(QObject* parent = nullptr) { Q_UNUSED(parent); }
 
     QVariantMap metaData() const {return QVariantMap();}
 
@@ -116,13 +116,13 @@ public:
 
     QContactAction* create(const QContactActionDescriptor& which) const
     {
-        Q_UNUSED(which)
+        Q_UNUSED(which);
         return new QDateAction;
     }
 
     QSet<QContactActionTarget> supportedTargets(const QContact& contact, const QContactActionDescriptor& which) const
     {
-        Q_UNUSED(which)
+        Q_UNUSED(which);
         QSet<QContactActionTarget> retn;
         QList<QContactDetail> dateDets = contact.details("DateDefinition");
         foreach (const QContactDetail& det, dateDets) {
@@ -137,7 +137,7 @@ public:
 
     QContactFilter contactFilter(const QContactActionDescriptor& which) const
     {
-        Q_UNUSED(which)
+        Q_UNUSED(which);
         QContactDetailFilter df;
         // XXX TODO: find some way to pass the defAndFieldNamesForTypeForActions value for Date to this function...
         df.setDetailDefinitionName("DateDefinition", "DateField");
diff --git a/tests/auto/contacts/qcontactmanagerfiltering/testactions/integeraction/integeraction_p.h b/tests/auto/contacts/qcontactmanagerfiltering/testactions/integeraction/integeraction_p.h
index 4f1f4fb03..357a1f8b6 100644
--- a/tests/auto/contacts/qcontactmanagerfiltering/testactions/integeraction/integeraction_p.h
+++ b/tests/auto/contacts/qcontactmanagerfiltering/testactions/integeraction/integeraction_p.h
@@ -54,7 +54,7 @@ QTCONTACTS_USE_NAMESPACE
 class DummyAction : public QContactAction
 {
 public:
-    DummyAction(QObject* parent = nullptr) { Q_UNUSED(parent) }
+    DummyAction(QObject* parent = nullptr) { Q_UNUSED(parent); }
 
     QVariantMap metaData() const {return QVariantMap();}
 
@@ -114,13 +114,13 @@ public:
 
     QContactAction* create(const QContactActionDescriptor& which) const
     {
-        Q_UNUSED(which)
+        Q_UNUSED(which);
         return new QIntegerAction;
     }
 
     QSet<QContactActionTarget> supportedTargets(const QContact& contact, const QContactActionDescriptor& which) const
     {
-        Q_UNUSED(which)
+        Q_UNUSED(which);
         QSet<QContactActionTarget> retn;
         QList<QContactDetail> intDets = contact.details("IntegerDefinition");
         foreach (const QContactDetail& det, intDets) {
@@ -135,7 +135,7 @@ public:
 
     QContactFilter contactFilter(const QContactActionDescriptor& which) const
     {
-        Q_UNUSED(which)
+        Q_UNUSED(which);
         QContactDetailFilter df;
         // XXX TODO: find some way to pass the defAndFieldNamesForTypeForActions value for Integer to this function...
         df.setDetailDefinitionName("IntegerDefinition", "IntegerField");
diff --git a/tests/auto/contacts/qcontactmanagerfiltering/testactions/numberaction/numberaction_p.h b/tests/auto/contacts/qcontactmanagerfiltering/testactions/numberaction/numberaction_p.h
index 3ed41887a..8ed38978e 100644
--- a/tests/auto/contacts/qcontactmanagerfiltering/testactions/numberaction/numberaction_p.h
+++ b/tests/auto/contacts/qcontactmanagerfiltering/testactions/numberaction/numberaction_p.h
@@ -54,7 +54,7 @@ QTCONTACTS_USE_NAMESPACE
 class DummyAction : public QContactAction
 {
 public:
-    DummyAction(QObject* parent = nullptr) { Q_UNUSED(parent) }
+    DummyAction(QObject* parent = nullptr) { Q_UNUSED(parent); }
 
     QVariantMap metaData() const {return QVariantMap();}
 
@@ -115,13 +115,13 @@ public:
 
     QContactAction* create(const QContactActionDescriptor& which) const
     {
-        Q_UNUSED(which)
+        Q_UNUSED(which);
         return new QNumberAction;
     }
 
     QSet<QContactActionTarget> supportedTargets(const QContact& contact, const QContactActionDescriptor& which) const
     {
-        Q_UNUSED(which)
+        Q_UNUSED(which);
         QSet<QContactActionTarget> retn;
         QList<QContactDetail> intDets = contact.details("IntegerDefinition");
         foreach (const QContactDetail& det, intDets) {
@@ -144,7 +144,7 @@ public:
 
     QContactFilter contactFilter(const QContactActionDescriptor& which) const
     {
-        Q_UNUSED(which)
+        Q_UNUSED(which);
         QContactDetailFilter df;
         // XXX TODO: find some way to pass the defAndFieldNamesForTypeForActions value for Double to this function...
         df.setDetailDefinitionName("DoubleDefinition", "DoubleField");
diff --git a/tests/auto/contacts/qcontactmanagerfiltering/testactions/phonenumberaction/phonenumberaction_p.h b/tests/auto/contacts/qcontactmanagerfiltering/testactions/phonenumberaction/phonenumberaction_p.h
index 2e24c03e5..e2f28a861 100644
--- a/tests/auto/contacts/qcontactmanagerfiltering/testactions/phonenumberaction/phonenumberaction_p.h
+++ b/tests/auto/contacts/qcontactmanagerfiltering/testactions/phonenumberaction/phonenumberaction_p.h
@@ -54,7 +54,7 @@ QTCONTACTS_USE_NAMESPACE
 class DummyAction : public QContactAction
 {
 public:
-    DummyAction(QObject* parent = nullptr) { Q_UNUSED(parent) }
+    DummyAction(QObject* parent = nullptr) { Q_UNUSED(parent); }
 
     QVariantMap metaData() const {return QVariantMap();}
 
@@ -115,13 +115,13 @@ public:
 
     QContactAction* create(const QContactActionDescriptor& which) const
     {
-        Q_UNUSED(which)
+        Q_UNUSED(which);
         return new QPhoneNumberAction;
     }
 
     QSet<QContactActionTarget> supportedTargets(const QContact& contact, const QContactActionDescriptor& which) const
     {
-        Q_UNUSED(which)
+        Q_UNUSED(which);
         QSet<QContactActionTarget> retn;
         QList<QContactDetail> pnDets = contact.details(QContactPhoneNumber::DefinitionName);
         foreach (const QContactDetail& det, pnDets) {
@@ -136,7 +136,7 @@ public:
 
     QContactFilter contactFilter(const QContactActionDescriptor& which) const
     {
-        Q_UNUSED(which)
+        Q_UNUSED(which);
         QContactDetailFilter df;
         // XXX TODO: find some way to pass the defAndFieldNamesForTypeForActions value for Integer to this function...
         df.setDetailDefinitionName(QContactPhoneNumber::DefinitionName, QContactPhoneNumber::FieldNumber);
diff --git a/tests/auto/organizer/qorganizermanager/tst_qorganizermanager.cpp b/tests/auto/organizer/qorganizermanager/tst_qorganizermanager.cpp
index 188a09989..ebf843f69 100644
--- a/tests/auto/organizer/qorganizermanager/tst_qorganizermanager.cpp
+++ b/tests/auto/organizer/qorganizermanager/tst_qorganizermanager.cpp
@@ -2345,7 +2345,7 @@ void tst_QOrganizerManager::observerDeletion()
     QVERIFY(manager->saveItem(&c));
     QOrganizerItemId id = c.id();
     QOrganizerItemObserver *observer = new QOrganizerItemObserver(manager, id);
-    Q_UNUSED(observer)
+    Q_UNUSED(observer);
     delete manager;
     delete observer;
     // Test for bug MOBILITY-2566 - that QOrganizerItemObserver doesn't crash when it is
diff --git a/tests/auto/versit/qversit/tst_qversit.cpp b/tests/auto/versit/qversit/tst_qversit.cpp
index 642816436..c9a9330a9 100644
--- a/tests/auto/versit/qversit/tst_qversit.cpp
+++ b/tests/auto/versit/qversit/tst_qversit.cpp
@@ -62,7 +62,7 @@ public:
     bool saveResource(const QByteArray& contents, const QVersitProperty& property,
                       QString* location)
     {
-        Q_UNUSED(property)
+        Q_UNUSED(property);
         *location = QString::number(mIndex++);
         mObjects.insert(*location, contents);
         return true;
@@ -70,9 +70,9 @@ public:
 
     bool loadResource(const QString &location, QByteArray *contents, QString *mimeType)
     {
-        Q_UNUSED(location)
-        Q_UNUSED(contents)
-        Q_UNUSED(mimeType)
+        Q_UNUSED(location);
+        Q_UNUSED(contents);
+        Q_UNUSED(mimeType);
         return false;
     }
 
diff --git a/tests/auto/versit/qversitcontactexporter/tst_qversitcontactexporter.cpp b/tests/auto/versit/qversitcontactexporter/tst_qversitcontactexporter.cpp
index f2e21636e..bdbeb4622 100644
--- a/tests/auto/versit/qversitcontactexporter/tst_qversitcontactexporter.cpp
+++ b/tests/auto/versit/qversitcontactexporter/tst_qversitcontactexporter.cpp
@@ -54,8 +54,8 @@ public:
                           const QContactDetail& detail,
                           QVersitDocument* document)
     {
-        Q_UNUSED(contact)
-        Q_UNUSED(document)
+        Q_UNUSED(contact);
+        Q_UNUSED(document);
         mPreProcessedDetails.append(detail);
         return mPreProcess;
     }
@@ -65,8 +65,8 @@ public:
                            bool alreadyProcessed,
                            QVersitDocument* document)
     {
-        Q_UNUSED(contact)
-        Q_UNUSED(document)
+        Q_UNUSED(contact);
+        Q_UNUSED(document);
         if (!alreadyProcessed)
             mUnknownDetails.append(detail);
         else
@@ -151,9 +151,9 @@ public:
 
     bool saveResource(const QByteArray &contents, const QVersitProperty &property, QString *location)
     {
-        Q_UNUSED(contents)
-        Q_UNUSED(property)
-        Q_UNUSED(location)
+        Q_UNUSED(contents);
+        Q_UNUSED(property);
+        Q_UNUSED(location);
         return false;
     }
 
diff --git a/tests/auto/versit/qversitcontactimporter/tst_qversitcontactimporter.cpp b/tests/auto/versit/qversitcontactimporter/tst_qversitcontactimporter.cpp
index 6f49e3255..77514b03a 100644
--- a/tests/auto/versit/qversitcontactimporter/tst_qversitcontactimporter.cpp
+++ b/tests/auto/versit/qversitcontactimporter/tst_qversitcontactimporter.cpp
@@ -53,8 +53,8 @@ public:
                             int contactIndex,
                             QContact* contact)
     {
-        Q_UNUSED(document)
-        Q_UNUSED(contact)
+        Q_UNUSED(document);
+        Q_UNUSED(contact);
         Q_UNUSED(contactIndex);
         mPreProcessedProperties.append(property);
         return mPreProcess;
@@ -66,9 +66,9 @@ public:
                              int contactIndex,
                              QContact* contact)
     {
-        Q_UNUSED(document)
-        Q_UNUSED(contact)
-        Q_UNUSED(contactIndex)
+        Q_UNUSED(document);
+        Q_UNUSED(contact);
+        Q_UNUSED(contactIndex);
         if (!alreadyProcessed)
             mUnknownProperties.append(property);
         else
@@ -111,9 +111,9 @@ public:
 
     bool loadResource(const QString &location, QByteArray *contents, QString *mimeType)
     {
-        Q_UNUSED(location)
-        Q_UNUSED(contents)
-        Q_UNUSED(mimeType)
+        Q_UNUSED(location);
+        Q_UNUSED(contents);
+        Q_UNUSED(mimeType);
         return false;
     }
 
diff --git a/tests/auto/versit/qversitcontactplugins/plugin1/plugin1.cpp b/tests/auto/versit/qversitcontactplugins/plugin1/plugin1.cpp
index 200784078..05b49e5a6 100644
--- a/tests/auto/versit/qversitcontactplugins/plugin1/plugin1.cpp
+++ b/tests/auto/versit/qversitcontactplugins/plugin1/plugin1.cpp
@@ -40,16 +40,16 @@ public:
                            bool* alreadyProcessed,
                            QList<QContactDetail>* updatedDetails)
     {
-        Q_UNUSED(document)
-        Q_UNUSED(property)
-        Q_UNUSED(contact)
-        Q_UNUSED(alreadyProcessed)
-        Q_UNUSED(updatedDetails)
+        Q_UNUSED(document);
+        Q_UNUSED(property);
+        Q_UNUSED(contact);
+        Q_UNUSED(alreadyProcessed);
+        Q_UNUSED(updatedDetails);
     }
     void documentProcessed(const QVersitDocument& document,
                            QContact* contact)
     {
-        Q_UNUSED(document)
+        Q_UNUSED(document);
         QContactDetail detail(QContactDetail::TypeExtendedDetail);
         detail.setValue(0, 1);
         contact->saveDetail(&detail);
@@ -61,17 +61,17 @@ public:
                          QList<QVersitProperty>* toBeRemoved,
                          QList<QVersitProperty>* toBeAdded)
     {
-        Q_UNUSED(contact)
-        Q_UNUSED(detail)
-        Q_UNUSED(document)
-        Q_UNUSED(processedFields)
-        Q_UNUSED(toBeRemoved)
-        Q_UNUSED(toBeAdded)
+        Q_UNUSED(contact);
+        Q_UNUSED(detail);
+        Q_UNUSED(document);
+        Q_UNUSED(processedFields);
+        Q_UNUSED(toBeRemoved);
+        Q_UNUSED(toBeAdded);
     }
     void contactProcessed(const QContact& contact,
                           QVersitDocument* document)
     {
-        Q_UNUSED(contact)
+        Q_UNUSED(contact);
         QVersitProperty property;
         property.setName("TEST-PROPERTY");
         property.setValue("1");
diff --git a/tests/auto/versit/qversitcontactplugins/plugin2/plugin2.cpp b/tests/auto/versit/qversitcontactplugins/plugin2/plugin2.cpp
index 6f3ce0d13..d1b85f0b3 100644
--- a/tests/auto/versit/qversitcontactplugins/plugin2/plugin2.cpp
+++ b/tests/auto/versit/qversitcontactplugins/plugin2/plugin2.cpp
@@ -40,16 +40,16 @@ public:
                            bool* alreadyProcessed,
                            QList<QContactDetail>* updatedDetails)
     {
-        Q_UNUSED(document)
-        Q_UNUSED(property)
-        Q_UNUSED(contact)
-        Q_UNUSED(alreadyProcessed)
-        Q_UNUSED(updatedDetails)
+        Q_UNUSED(document);
+        Q_UNUSED(property);
+        Q_UNUSED(contact);
+        Q_UNUSED(alreadyProcessed);
+        Q_UNUSED(updatedDetails);
     }
     void documentProcessed(const QVersitDocument& document,
                            QContact* contact)
     {
-        Q_UNUSED(document)
+        Q_UNUSED(document);
         QContactDetail detail(QContactDetail::TypeExtendedDetail);
         detail.setValue(0, 2);
         contact->saveDetail(&detail);
@@ -61,17 +61,17 @@ public:
                          QList<QVersitProperty>* toBeRemoved,
                          QList<QVersitProperty>* toBeAdded)
     {
-        Q_UNUSED(contact)
-        Q_UNUSED(detail)
-        Q_UNUSED(document)
-        Q_UNUSED(processedFields)
-        Q_UNUSED(toBeRemoved)
-        Q_UNUSED(toBeAdded)
+        Q_UNUSED(contact);
+        Q_UNUSED(detail);
+        Q_UNUSED(document);
+        Q_UNUSED(processedFields);
+        Q_UNUSED(toBeRemoved);
+        Q_UNUSED(toBeAdded);
     }
     void contactProcessed(const QContact& contact,
                           QVersitDocument* document)
     {
-        Q_UNUSED(contact)
+        Q_UNUSED(contact);
         QVersitProperty property;
         property.setName("TEST-PROPERTY");
         property.setValue("2");
diff --git a/tests/auto/versit/qversitcontactplugins/plugin3/plugin3.cpp b/tests/auto/versit/qversitcontactplugins/plugin3/plugin3.cpp
index 885dbb9d0..231a9f8df 100644
--- a/tests/auto/versit/qversitcontactplugins/plugin3/plugin3.cpp
+++ b/tests/auto/versit/qversitcontactplugins/plugin3/plugin3.cpp
@@ -40,16 +40,16 @@ public:
                            bool* alreadyProcessed,
                            QList<QContactDetail>* updatedDetails)
     {
-        Q_UNUSED(document)
-        Q_UNUSED(property)
-        Q_UNUSED(contact)
-        Q_UNUSED(alreadyProcessed)
-        Q_UNUSED(updatedDetails)
+        Q_UNUSED(document);
+        Q_UNUSED(property);
+        Q_UNUSED(contact);
+        Q_UNUSED(alreadyProcessed);
+        Q_UNUSED(updatedDetails);
     }
     void documentProcessed(const QVersitDocument& document,
                            QContact* contact)
     {
-        Q_UNUSED(document)
+        Q_UNUSED(document);
         QContactDetail detail(QContactDetail::TypeExtendedDetail);
         detail.setValue(0, 3);
         contact->saveDetail(&detail);
@@ -61,17 +61,17 @@ public:
                          QList<QVersitProperty>* toBeRemoved,
                          QList<QVersitProperty>* toBeAdded)
     {
-        Q_UNUSED(contact)
-        Q_UNUSED(detail)
-        Q_UNUSED(document)
-        Q_UNUSED(processedFields)
-        Q_UNUSED(toBeRemoved)
-        Q_UNUSED(toBeAdded)
+        Q_UNUSED(contact);
+        Q_UNUSED(detail);
+        Q_UNUSED(document);
+        Q_UNUSED(processedFields);
+        Q_UNUSED(toBeRemoved);
+        Q_UNUSED(toBeAdded);
     }
     void contactProcessed(const QContact& contact,
                           QVersitDocument* document)
     {
-        Q_UNUSED(contact)
+        Q_UNUSED(contact);
         QVersitProperty property;
         property.setName("TEST-PROPERTY");
         property.setValue("3");
diff --git a/tests/auto/versit/qversitcontactplugins/plugin4/plugin4.cpp b/tests/auto/versit/qversitcontactplugins/plugin4/plugin4.cpp
index 57777b9cc..20efde902 100644
--- a/tests/auto/versit/qversitcontactplugins/plugin4/plugin4.cpp
+++ b/tests/auto/versit/qversitcontactplugins/plugin4/plugin4.cpp
@@ -40,16 +40,16 @@ public:
                            bool* alreadyProcessed,
                            QList<QContactDetail>* updatedDetails)
     {
-        Q_UNUSED(document)
-        Q_UNUSED(property)
-        Q_UNUSED(contact)
-        Q_UNUSED(alreadyProcessed)
-        Q_UNUSED(updatedDetails)
+        Q_UNUSED(document);
+        Q_UNUSED(property);
+        Q_UNUSED(contact);
+        Q_UNUSED(alreadyProcessed);
+        Q_UNUSED(updatedDetails);
     }
     void documentProcessed(const QVersitDocument& document,
                            QContact* contact)
     {
-        Q_UNUSED(document)
+        Q_UNUSED(document);
         QContactDetail detail(QContactDetail::TypeExtendedDetail);
         detail.setValue(0, 4);
         contact->saveDetail(&detail);
@@ -61,17 +61,17 @@ public:
                          QList<QVersitProperty>* toBeRemoved,
                          QList<QVersitProperty>* toBeAdded)
     {
-        Q_UNUSED(contact)
-        Q_UNUSED(detail)
-        Q_UNUSED(document)
-        Q_UNUSED(processedFields)
-        Q_UNUSED(toBeRemoved)
-        Q_UNUSED(toBeAdded)
+        Q_UNUSED(contact);
+        Q_UNUSED(detail);
+        Q_UNUSED(document);
+        Q_UNUSED(processedFields);
+        Q_UNUSED(toBeRemoved);
+        Q_UNUSED(toBeAdded);
     }
     void contactProcessed(const QContact& contact,
                           QVersitDocument* document)
     {
-        Q_UNUSED(contact)
+        Q_UNUSED(contact);
         QVersitProperty property;
         property.setName("TEST-PROPERTY");
         property.setValue("4");
diff --git a/tests/auto/versit/qversitcontactplugins/plugin5/plugin5.cpp b/tests/auto/versit/qversitcontactplugins/plugin5/plugin5.cpp
index 791fb58dc..52860906a 100644
--- a/tests/auto/versit/qversitcontactplugins/plugin5/plugin5.cpp
+++ b/tests/auto/versit/qversitcontactplugins/plugin5/plugin5.cpp
@@ -40,16 +40,16 @@ public:
                            bool* alreadyProcessed,
                            QList<QContactDetail>* updatedDetails)
     {
-        Q_UNUSED(document)
-        Q_UNUSED(property)
-        Q_UNUSED(contact)
-        Q_UNUSED(alreadyProcessed)
-        Q_UNUSED(updatedDetails)
+        Q_UNUSED(document);
+        Q_UNUSED(property);
+        Q_UNUSED(contact);
+        Q_UNUSED(alreadyProcessed);
+        Q_UNUSED(updatedDetails);
     }
     void documentProcessed(const QVersitDocument& document,
                            QContact* contact)
     {
-        Q_UNUSED(document)
+        Q_UNUSED(document);
         QContactDetail detail(QContactDetail::TypeExtendedDetail);
         detail.setValue(0, 5);
         contact->saveDetail(&detail);
@@ -61,17 +61,17 @@ public:
                          QList<QVersitProperty>* toBeRemoved,
                          QList<QVersitProperty>* toBeAdded)
     {
-        Q_UNUSED(contact)
-        Q_UNUSED(detail)
-        Q_UNUSED(document)
-        Q_UNUSED(processedFields)
-        Q_UNUSED(toBeRemoved)
-        Q_UNUSED(toBeAdded)
+        Q_UNUSED(contact);
+        Q_UNUSED(detail);
+        Q_UNUSED(document);
+        Q_UNUSED(processedFields);
+        Q_UNUSED(toBeRemoved);
+        Q_UNUSED(toBeAdded);
     }
     void contactProcessed(const QContact& contact,
                           QVersitDocument* document)
     {
-        Q_UNUSED(contact)
+        Q_UNUSED(contact);
         QVersitProperty property;
         property.setName("TEST-PROPERTY");
         property.setValue("5");