summaryrefslogtreecommitdiffstats
path: root/src/client/qwaylandinputdevice.cpp
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2019-03-22 11:24:27 +0100
committerKai Koehne <kai.koehne@qt.io>2019-03-22 14:14:19 +0000
commit0f3ff1823c4bf1fc12280a677b871f381c77d0fb (patch)
tree13bd46e0a91e2fd8badfee79d65fcecc6a134331 /src/client/qwaylandinputdevice.cpp
parentc16810c2169affe390d1d403d2e2caa8730fc80f (diff)
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>
Diffstat (limited to 'src/client/qwaylandinputdevice.cpp')
-rw-r--r--src/client/qwaylandinputdevice.cpp8
1 files changed, 4 insertions, 4 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;