1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation with QT_NO_WARNING_OUTPUT

Browse Source 
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>
This commit is contained in:
Kai Koehne 2019-03-22 11:24:27 +01:00
parent 5098f9f6e7
commit 3d147d01e3
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/wayland/qwaylandinputdevice.cpp
View File

@ -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,7 +585,7 @@ 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"
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();

9
src/plugins/platforms/wayland/qwaylandwindow.cpp
View File

@ -487,10 +487,10 @@ 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:"
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()
<< "screen name:" << addedScreen->name() << "screen model:" << addedScreen->model()
<< "This is most likely a bug in the compositor.";
return;
}
@ -508,7 +508,8 @@ 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:"
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()