diff options
author | Lars Schmertmann <Lars.Schmertmann@governikus.de> | 2020-06-23 17:01:08 +0200 |
---|---|---|
committer | Lars Schmertmann <Lars.Schmertmann@governikus.de> | 2020-06-24 19:42:13 +0200 |
commit | 5b18c6d4b7cd5c24733d4e92f3d42771c9adf3c2 (patch) | |
tree | ea696324982563104b029b0117afb7e3304a8bef | |
parent | fe1360a3868783c00d3979259583bf0dfe5f82da (diff) |
Add ; to Q_UNUSED
This is required to remove the ; from the macro with Qt 6.
Task-number: QTBUG-82978
Change-Id: Ie1081f1a8a35e1ae7f57697dafee066969463967
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
-rw-r--r-- | src/activeqt/control/qaxfactory.cpp | 6 | ||||
-rw-r--r-- | src/activeqt/control/qaxserverbase.cpp | 4 | ||||
-rw-r--r-- | tools/testcon/mainwindow.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/activeqt/control/qaxfactory.cpp b/src/activeqt/control/qaxfactory.cpp index 2faf508..ba8a566 100644 --- a/src/activeqt/control/qaxfactory.cpp +++ b/src/activeqt/control/qaxfactory.cpp @@ -241,7 +241,7 @@ QUuid QAxFactory::eventsID(const QString &key) const void QAxFactory::registerClass(const QString &key, QSettings *settings) const { Q_UNUSED(key); - Q_UNUSED(settings) + Q_UNUSED(settings); } /*! @@ -255,7 +255,7 @@ void QAxFactory::registerClass(const QString &key, QSettings *settings) const void QAxFactory::unregisterClass(const QString &key, QSettings *settings) const { Q_UNUSED(key); - Q_UNUSED(settings) + Q_UNUSED(settings); } /*! @@ -317,7 +317,7 @@ QString QAxFactory::exposeToSuperClass(const QString &key) const */ bool QAxFactory::stayTopLevel(const QString &key) const { - Q_UNUSED(key) + Q_UNUSED(key); return false; } diff --git a/src/activeqt/control/qaxserverbase.cpp b/src/activeqt/control/qaxserverbase.cpp index 55b5051..3aefc23 100644 --- a/src/activeqt/control/qaxserverbase.cpp +++ b/src/activeqt/control/qaxserverbase.cpp @@ -2984,7 +2984,7 @@ HRESULT WINAPI QAxServerBase::Load(IPropertyBag *bag, IErrorLog * /*log*/) updateGeometry(); - Q_UNUSED(error) + Q_UNUSED(error); return /*error ? E_FAIL :*/ S_OK; } @@ -3016,7 +3016,7 @@ HRESULT WINAPI QAxServerBase::Save(IPropertyBag *bag, BOOL clearDirty, BOOL /*sa bag->Write(bstr, &var); SysFreeString(bstr); } - Q_UNUSED(error) + Q_UNUSED(error); return /*error ? E_FAIL :*/ S_OK; } diff --git a/tools/testcon/mainwindow.cpp b/tools/testcon/mainwindow.cpp index 5bee9c4..1e5347e 100644 --- a/tools/testcon/mainwindow.cpp +++ b/tools/testcon/mainwindow.cpp @@ -476,7 +476,7 @@ bool MainWindow::loadScript(const QString &file) } return script; #else // !QT_NO_QAXSCRIPT - Q_UNUSED(file) + Q_UNUSED(file); noScriptMessage(this); return false; #endif |