|
 |
91d4fa |
From 911762e077c8b2f9795171c1e628942a0a979801 Mon Sep 17 00:00:00 2001
|
|
|
91d4fa |
From: Jan Grulich <jgrulich@redhat.com>
|
|
|
91d4fa |
Date: Fri, 15 Dec 2017 11:56:12 +0100
|
|
|
91d4fa |
Subject: foo
|
|
|
91d4fa |
|
|
|
91d4fa |
|
|
|
91d4fa |
diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp
|
|
|
91d4fa |
index 536c709..c6eb1b1 100644
|
|
|
91d4fa |
--- a/src/plugins/platforms/xcb/qxcbconnection.cpp
|
|
|
91d4fa |
+++ b/src/plugins/platforms/xcb/qxcbconnection.cpp
|
|
|
91d4fa |
@@ -111,6 +111,8 @@ Q_LOGGING_CATEGORY(lcQpaXInputEvents, "qt.qpa.input.events")
|
|
|
91d4fa |
Q_LOGGING_CATEGORY(lcQpaScreen, "qt.qpa.screen")
|
|
|
91d4fa |
Q_LOGGING_CATEGORY(lcQpaEvents, "qt.qpa.events")
|
|
|
91d4fa |
Q_LOGGING_CATEGORY(lcQpaXcb, "qt.qpa.xcb") // for general (uncategorized) XCB logging
|
|
|
91d4fa |
+Q_LOGGING_CATEGORY(lcQpaXcbError, "qt.qpa.xcb.xcberror")
|
|
|
91d4fa |
+// TODO: How to categorize by xcberror type? (e.g. only BadWindow)
|
|
|
91d4fa |
Q_LOGGING_CATEGORY(lcQpaPeeker, "qt.qpa.peeker")
|
|
|
91d4fa |
|
|
|
91d4fa |
// this event type was added in libxcb 1.10,
|
|
|
91d4fa |
@@ -964,7 +966,8 @@ void QXcbConnection::handleXcbError(xcb_generic_error_t *error)
|
|
|
91d4fa |
uint clamped_error_code = qMin<uint>(error->error_code, (sizeof(xcb_errors) / sizeof(xcb_errors[0])) - 1);
|
|
|
91d4fa |
uint clamped_major_code = qMin<uint>(error->major_code, (sizeof(xcb_protocol_request_codes) / sizeof(xcb_protocol_request_codes[0])) - 1);
|
|
|
91d4fa |
|
|
|
91d4fa |
- qWarning("QXcbConnection: XCB error: %d (%s), sequence: %d, resource id: %d, major code: %d (%s), minor code: %d",
|
|
|
91d4fa |
+ qCWarning(lcQpaXcbError,
|
|
|
91d4fa |
+ "QXcbConnection: XCB error: %d (%s), sequence: %d, resource id: %d, major code: %d (%s), minor code: %d",
|
|
|
91d4fa |
int(error->error_code), xcb_errors[clamped_error_code],
|
|
|
91d4fa |
int(error->sequence), int(error->resource_id),
|
|
|
91d4fa |
int(error->major_code), xcb_protocol_request_codes[clamped_major_code],
|
|
|
91d4fa |
diff --git a/src/plugins/platforms/xcb/qxcbconnection.h b/src/plugins/platforms/xcb/qxcbconnection.h
|
|
|
91d4fa |
index 999dc06..554611c 100644
|
|
|
91d4fa |
--- a/src/plugins/platforms/xcb/qxcbconnection.h
|
|
|
91d4fa |
+++ b/src/plugins/platforms/xcb/qxcbconnection.h
|
|
|
91d4fa |
@@ -91,6 +91,7 @@ Q_DECLARE_LOGGING_CATEGORY(lcQpaXInputEvents)
|
|
|
91d4fa |
Q_DECLARE_LOGGING_CATEGORY(lcQpaScreen)
|
|
|
91d4fa |
Q_DECLARE_LOGGING_CATEGORY(lcQpaEvents)
|
|
|
91d4fa |
Q_DECLARE_LOGGING_CATEGORY(lcQpaXcb)
|
|
|
91d4fa |
+Q_DECLARE_LOGGING_CATEGORY(lcQpaXcbError)
|
|
|
91d4fa |
Q_DECLARE_LOGGING_CATEGORY(lcQpaPeeker)
|
|
|
91d4fa |
|
|
|
91d4fa |
class QXcbVirtualDesktop;
|