diff options
| author | Lars Schmertmann <Lars.Schmertmann@governikus.de> | 2020-06-26 14:43:02 +0200 |
|---|---|---|
| committer | Lars Schmertmann <Lars.Schmertmann@governikus.de> | 2020-06-26 19:18:03 +0200 |
| commit | e79281533d61dda90d1c5995345a66e6089c7501 (patch) | |
| tree | 5033642cb0ae1d76aa0fc0525e153c04eefc921d /src/quick/designer | |
| parent | 6d8aca544ccb1e2624a679e2d65622461f643291 (diff) | |
Add ; to Q_UNUSED and UNUSED_PARAM
This is required to remove the ; from the macro with Qt 6.
Task-number: QTBUG-82978
Change-Id: Iead53d18fd790fb2d870d80ef2db79666f0d2392
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/quick/designer')
| -rw-r--r-- | src/quick/designer/qquickdesignercustomobjectdata.cpp | 4 | ||||
| -rw-r--r-- | src/quick/designer/qquickdesignersupportitems.cpp | 4 | ||||
| -rw-r--r-- | src/quick/designer/qquickdesignerwindowmanager.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/quick/designer/qquickdesignercustomobjectdata.cpp b/src/quick/designer/qquickdesignercustomobjectdata.cpp index 66a86bffd5..86a14b622e 100644 --- a/src/quick/designer/qquickdesignercustomobjectdata.cpp +++ b/src/quick/designer/qquickdesignercustomobjectdata.cpp @@ -291,8 +291,8 @@ void QQuickDesignerCustomObjectData::keepBindingFromGettingDeleted(QQmlContext * const QQuickDesignerSupport::PropertyName &propertyName) { //Refcounting is taking care - Q_UNUSED(context) - Q_UNUSED(propertyName) + Q_UNUSED(context); + Q_UNUSED(propertyName); } void QQuickDesignerCustomObjectData::handleDestroyed() diff --git a/src/quick/designer/qquickdesignersupportitems.cpp b/src/quick/designer/qquickdesignersupportitems.cpp index 4fd9158f4a..cec4fa2d7c 100644 --- a/src/quick/designer/qquickdesignersupportitems.cpp +++ b/src/quick/designer/qquickdesignersupportitems.cpp @@ -214,7 +214,7 @@ QObject *QQuickDesignerSupportItems::createPrimitive(const QString &typeName, QT { ComponentCompleteDisabler disableComponentComplete; - Q_UNUSED(disableComponentComplete) + Q_UNUSED(disableComponentComplete); QObject *object = nullptr; QQmlType type = QQmlMetaType::qmlType(typeName, version); @@ -260,7 +260,7 @@ QObject *QQuickDesignerSupportItems::createPrimitive(const QString &typeName, QT QObject *QQuickDesignerSupportItems::createComponent(const QUrl &componentUrl, QQmlContext *context) { ComponentCompleteDisabler disableComponentComplete; - Q_UNUSED(disableComponentComplete) + Q_UNUSED(disableComponentComplete); QQmlComponent component(context->engine(), componentUrl); diff --git a/src/quick/designer/qquickdesignerwindowmanager.cpp b/src/quick/designer/qquickdesignerwindowmanager.cpp index 04df6b2832..18daab70e8 100644 --- a/src/quick/designer/qquickdesignerwindowmanager.cpp +++ b/src/quick/designer/qquickdesignerwindowmanager.cpp @@ -86,7 +86,7 @@ void QQuickDesignerWindowManager::makeOpenGLContext(QQuickWindow *window) m_openGlContext->makeCurrent(window); } #else - Q_UNUSED(window) + Q_UNUSED(window); #endif } |