From 9bb48c315c129842d9b50142c7f33ef4bd1a8df2 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Sun, 5 Jan 2025 11:52:08 +0100 Subject: [PATCH] QWaylandClientExtensionTemplate: reflow qWarning() in bind() As suggested in 6.9 API-review, reflow the long line and put the interface.name onto a separate line in the log output. Amends 8784a01787f72bfea7124ecb2b896ebf644d1824. Pick-to: 6.9 Change-Id: I12f00b65d7b22ac9330b25faca28edaa7a159a3a Reviewed-by: Volker Hilsheimer Reviewed-by: David Edmundson --- .../platforms/wayland/global/qwaylandclientextension.h | 4 +++- .../wayland/shellintegration/qwaylandshellintegration_p.h | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/plugins/platforms/wayland/global/qwaylandclientextension.h b/src/plugins/platforms/wayland/global/qwaylandclientextension.h index 774c5ba7750..6079e990168 100644 --- a/src/plugins/platforms/wayland/global/qwaylandclientextension.h +++ b/src/plugins/platforms/wayland/global/qwaylandclientextension.h @@ -84,7 +84,9 @@ public: // developer and the version specified in the protocol and also the // compositor version. if (this->version() > T::interface()->version) { - qWarning("Supplied protocol version to QWaylandClientExtensionTemplate is higher than the version of the protocol, using protocol version instead. interface.name: %s", + qWarning("Supplied protocol version to QWaylandClientExtensionTemplate is higher " + "than the version of the protocol, using protocol version instead.\n" + " interface.name: %s", T::interface()->name); } int minVersion = qMin(ver, qMin(T::interface()->version, this->version())); diff --git a/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegration_p.h b/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegration_p.h index 59b3c9e5a13..0f76e5aceb5 100644 --- a/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegration_p.h +++ b/src/plugins/platforms/wayland/shellintegration/qwaylandshellintegration_p.h @@ -81,7 +81,9 @@ public: // developer and the version specified in the protocol and also the // compositor version. if (this->version() > T::interface()->version) { - qWarning("Supplied protocol version to QWaylandClientExtensionTemplate is higher than the version of the protocol, using protocol version instead. interface.name: %s", + qWarning("Supplied protocol version to QWaylandClientExtensionTemplate is higher " + "than the version of the protocol, using protocol version instead.\n" + " interface.name: %s", T::interface()->name); } int minVersion = qMin(ver, qMin(T::interface()->version, this->version()));