From 6ce2f3f26bf08b4c6952f492a3731eb4fe5a42bc Mon Sep 17 00:00:00 2001 From: Lars Schmertmann Date: Sat, 27 Jun 2020 14:18:09 +0200 Subject: 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 --- qmake/library/qmakevfs.cpp | 6 +++--- qmake/library/registry.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'qmake/library') diff --git a/qmake/library/qmakevfs.cpp b/qmake/library/qmakevfs.cpp index 3ccfcc78ee..a187749ee1 100644 --- a/qmake/library/qmakevfs.cpp +++ b/qmake/library/qmakevfs.cpp @@ -142,12 +142,12 @@ bool QMakeVfs::writeFile(int id, QIODevice::OpenMode mode, VfsFlags flags, QMutexLocker locker(&m_mutex); # endif QString *cont = &m_files[id]; - Q_UNUSED(flags) + Q_UNUSED(flags); if (mode & QIODevice::Append) *cont += contents; else *cont = contents; - Q_UNUSED(errStr) + Q_UNUSED(errStr); return true; #else QFileInfo qfi(fileNameForId(id)); @@ -243,7 +243,7 @@ bool QMakeVfs::exists(const QString &fn, VfsFlags flags) if (it != m_files.constEnd()) return it->constData() != m_magicMissing.constData(); #else - Q_UNUSED(flags) + Q_UNUSED(flags); #endif bool ex = IoUtils::fileType(fn) == IoUtils::FileIsRegular; #ifndef PROEVALUATOR_FULL diff --git a/qmake/library/registry.cpp b/qmake/library/registry.cpp index 3391ab9512..930e8e2ee6 100644 --- a/qmake/library/registry.cpp +++ b/qmake/library/registry.cpp @@ -147,7 +147,7 @@ QString qt_readRegistryKey(HKEY parentHandle, const QString &rSubkey, unsigned l RegCloseKey(handle); #else Q_UNUSED(parentHandle); - Q_UNUSED(rSubkey) + Q_UNUSED(rSubkey); Q_UNUSED(options); #endif -- cgit v1.2.3