diff options
| author | Lars Schmertmann <Lars.Schmertmann@governikus.de> | 2020-06-27 13:01:59 +0200 |
|---|---|---|
| committer | Lars Schmertmann <Lars.Schmertmann@governikus.de> | 2020-07-31 20:07:50 +0200 |
| commit | d880a13f03d0f9606e7989ffbb579a5c8cf362b2 (patch) | |
| tree | a9f194e5638b07597036ee79db5c4a3175621f30 | |
| parent | e5aae7da3352931d286e18c4a4d3e69237479860 (diff) | |
Add ; to Q_UNUSED
This is required to remove the ; from the macro with Qt 6.
Task-number: QTBUG-82978
Change-Id: Iba7f98e41459f95a4fb6dffd9e6d1996722d92e8
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| -rw-r--r-- | src/plugins/android/qandroidwebview.cpp | 36 | ||||
| -rw-r--r-- | src/webview/qquickviewcontroller.cpp | 2 | ||||
| -rw-r--r-- | src/webview/qwebviewfactory.cpp | 2 |
3 files changed, 20 insertions, 20 deletions
diff --git a/src/plugins/android/qandroidwebview.cpp b/src/plugins/android/qandroidwebview.cpp index 91122bd..3c7b759 100644 --- a/src/plugins/android/qandroidwebview.cpp +++ b/src/plugins/android/qandroidwebview.cpp @@ -263,8 +263,8 @@ static void c_onRunJavaScriptResult(JNIEnv *env, jlong callbackId, jstring result) { - Q_UNUSED(env) - Q_UNUSED(thiz) + Q_UNUSED(env); + Q_UNUSED(thiz); const WebViews &wv = (*g_webViews); QAndroidWebViewPrivate *wc = static_cast<QAndroidWebViewPrivate *>(wv[id]); @@ -293,8 +293,8 @@ static void c_onPageFinished(JNIEnv *env, jlong id, jstring url) { - Q_UNUSED(env) - Q_UNUSED(thiz) + Q_UNUSED(env); + Q_UNUSED(thiz); const WebViews &wv = (*g_webViews); QAndroidWebViewPrivate *wc = wv[id]; if (!wc) @@ -312,9 +312,9 @@ static void c_onPageStarted(JNIEnv *env, jstring url, jobject icon) { - Q_UNUSED(env) - Q_UNUSED(thiz) - Q_UNUSED(icon) + Q_UNUSED(env); + Q_UNUSED(thiz); + Q_UNUSED(icon); const WebViews &wv = (*g_webViews); QAndroidWebViewPrivate *wc = wv[id]; if (!wc) @@ -337,8 +337,8 @@ static void c_onProgressChanged(JNIEnv *env, jlong id, jint newProgress) { - Q_UNUSED(env) - Q_UNUSED(thiz) + Q_UNUSED(env); + Q_UNUSED(thiz); const WebViews &wv = (*g_webViews); QAndroidWebViewPrivate *wc = wv[id]; if (!wc) @@ -352,10 +352,10 @@ static void c_onReceivedIcon(JNIEnv *env, jlong id, jobject icon) { - Q_UNUSED(env) - Q_UNUSED(thiz) - Q_UNUSED(id) - Q_UNUSED(icon) + Q_UNUSED(env); + Q_UNUSED(thiz); + Q_UNUSED(id); + Q_UNUSED(icon); const WebViews &wv = (*g_webViews); QAndroidWebViewPrivate *wc = wv[id]; @@ -375,8 +375,8 @@ static void c_onReceivedTitle(JNIEnv *env, jlong id, jstring title) { - Q_UNUSED(env) - Q_UNUSED(thiz) + Q_UNUSED(env); + Q_UNUSED(thiz); const WebViews &wv = (*g_webViews); QAndroidWebViewPrivate *wc = wv[id]; if (!wc) @@ -393,9 +393,9 @@ static void c_onReceivedError(JNIEnv *env, jstring description, jstring url) { - Q_UNUSED(env) - Q_UNUSED(thiz) - Q_UNUSED(errorCode) + Q_UNUSED(env); + Q_UNUSED(thiz); + Q_UNUSED(errorCode); const WebViews &wv = (*g_webViews); QAndroidWebViewPrivate *wc = wv[id]; diff --git a/src/webview/qquickviewcontroller.cpp b/src/webview/qquickviewcontroller.cpp index 5986d23..35e2450 100644 --- a/src/webview/qquickviewcontroller.cpp +++ b/src/webview/qquickviewcontroller.cpp @@ -95,7 +95,7 @@ void QQuickViewChangeListener::itemGeometryChanged(QQuickItem *, QQuickGeometryC void QQuickViewChangeListener::itemChildRemoved(QQuickItem *item, QQuickItem *child) { - Q_UNUSED(item) + Q_UNUSED(item); Q_ASSERT(item != m_item); const bool remove = (child == m_item) || isAncestor(child); diff --git a/src/webview/qwebviewfactory.cpp b/src/webview/qwebviewfactory.cpp index 8856168..06b8659 100644 --- a/src/webview/qwebviewfactory.cpp +++ b/src/webview/qwebviewfactory.cpp @@ -65,7 +65,7 @@ public: void setVisible(bool visible) override { Q_UNUSED(visible); } QString httpUserAgent() const override { return QString(); } - void setHttpUserAgent(const QString &userAgent) override { Q_UNUSED(userAgent) } + void setHttpUserAgent(const QString &userAgent) override { Q_UNUSED(userAgent); } QUrl url() const override { return QUrl(); } void setUrl(const QUrl &url) override { Q_UNUSED(url); } bool canGoBack() const override { return false; } |