Fix compilation with QT_NO_WARNING_OUTPUT

Use qCWarning instead of qWarning if logging into a category. This
fixes compilation with QT_NO_WARNING_OUPUT, but in addition also
avoids unnecessary string formatting if the category is disabled.

Fixes: QTBUG-74359
Change-Id: I0e316a833f3f7d4a9122377a1154e739bcb080b1
Reviewed-by: Johan Helsing <johan.helsing@qt.io>

2 files changed, 15 insertions, 14 deletions

diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp
index 76000e542..2ae2caca2 100644
--- a/src/client/qwaylandinputdevice.cpp
+++ b/src/client/qwaylandinputdevice.cpp
@@ -316,7 +316,7 @@ void QWaylandInputDevice::Pointer::updateCursorTheme()
         while (scale > 1 && arrowPixelSize / scale < cursorSize())
             --scale;
     } else {
-        qWarning(lcQpaWayland) << "Cursor theme does not support the arrow cursor";
+        qCWarning(lcQpaWayland) << "Cursor theme does not support the arrow cursor";
     }
     mCursor.themeBufferScale = scale;
 }
@@ -585,9 +585,9 @@ void QWaylandInputDevice::Pointer::pointer_enter(uint32_t serial, struct wl_surf
     QWaylandWindow *window = QWaylandWindow::fromWlSurface(surface);
 
     if (mFocus) {
-        qWarning(lcQpaWayland) << "The compositor sent a wl_pointer.enter event before sending a"
-                               << "leave event first, this is not allowed by the wayland protocol"
-                               << "attempting to work around it by invalidating the current focus";
+        qCWarning(lcQpaWayland) << "The compositor sent a wl_pointer.enter event before sending a"
+                                << "leave event first, this is not allowed by the wayland protocol"
+                                << "attempting to work around it by invalidating the current focus";
         invalidateFocus();
     }
     mFocus = window;
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
index ca4d176fe..20a671c6c 100644
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
@@ -487,11 +487,11 @@ void QWaylandWindow::surface_enter(wl_output *output)
     auto addedScreen = QWaylandScreen::fromWlOutput(output);
 
     if (mScreens.contains(addedScreen)) {
-        qWarning(lcQpaWayland) << "Ignoring unexpected wl_surface.enter received for output with id:"
-                               << wl_proxy_get_id(reinterpret_cast<wl_proxy *>(output))
-                               << "screen name:" << addedScreen->name()
-                               << "screen model:" << addedScreen->model()
-                               << "This is most likely a bug in the compositor.";
+        qCWarning(lcQpaWayland)
+                << "Ignoring unexpected wl_surface.enter received for output with id:"
+                << wl_proxy_get_id(reinterpret_cast<wl_proxy *>(output))
+                << "screen name:" << addedScreen->name() << "screen model:" << addedScreen->model()
+                << "This is most likely a bug in the compositor.";
         return;
     }
 
@@ -508,11 +508,12 @@ void QWaylandWindow::surface_leave(wl_output *output)
     auto *removedScreen = QWaylandScreen::fromWlOutput(output);
     bool wasRemoved = mScreens.removeOne(removedScreen);
     if (!wasRemoved) {
-        qWarning(lcQpaWayland) << "Ignoring unexpected wl_surface.leave received for output with id:"
-                               << wl_proxy_get_id(reinterpret_cast<wl_proxy *>(output))
-                               << "screen name:" << removedScreen->name()
-                               << "screen model:" << removedScreen->model()
-                               << "This is most likely a bug in the compositor.";
+        qCWarning(lcQpaWayland)
+                << "Ignoring unexpected wl_surface.leave received for output with id:"
+                << wl_proxy_get_id(reinterpret_cast<wl_proxy *>(output))
+                << "screen name:" << removedScreen->name()
+                << "screen model:" << removedScreen->model()
+                << "This is most likely a bug in the compositor.";
         return;
     }