diff options
| author | Lars Schmertmann <Lars.Schmertmann@governikus.de> | 2020-06-27 14:18:09 +0200 |
|---|---|---|
| committer | Lars Schmertmann <Lars.Schmertmann@governikus.de> | 2020-07-07 11:51:48 +0200 |
| commit | 6ce2f3f26bf08b4c6952f492a3731eb4fe5a42bc (patch) | |
| tree | 727427eb4c603e74954d4da462484ea7bf5c65bb /qmake | |
| parent | d9cc1499954829faf9486fb72056e29f1bad58e3 (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 'qmake')
| -rw-r--r-- | qmake/library/qmakevfs.cpp | 6 | ||||
| -rw-r--r-- | qmake/library/registry.cpp | 2 | ||||
| -rw-r--r-- | qmake/option.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
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 diff --git a/qmake/option.cpp b/qmake/option.cpp index 2d5ef9dfd6..58688ab2d6 100644 --- a/qmake/option.cpp +++ b/qmake/option.cpp @@ -613,7 +613,7 @@ void EvalHandler::message(int type, const QString &msg, const QString &fileName, void EvalHandler::fileMessage(int type, const QString &msg) { - Q_UNUSED(type) + Q_UNUSED(type); fprintf(stderr, "%s\n", qPrintable(msg)); } |