From 5dae375c24c99c687b8edf912100a6fffb30dd4b Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 6 Feb 2014 17:12:34 +0100 Subject: [PATCH] Fix checking of category for printf-style qCDebug Fixes an issue introduced in b8a38a6737a. We forgot to check for category validness, and printed qCDebug(c, ""...) unconditionally for compilers not supporting variadic macros. Change-Id: I779a97dacd7ea559f0d91473aad2c29e73ea2f89 Reviewed-by: Thiago Macieira Reviewed-by: Konstantin Ritt --- src/corelib/global/qlogging.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp index dbe28da120..e3cce79baf 100644 --- a/src/corelib/global/qlogging.cpp +++ b/src/corelib/global/qlogging.cpp @@ -322,6 +322,8 @@ void QMessageLogger::debug(QMessageLogger::CategoryFunction catFunc, const char *msg, ...) const { const QLoggingCategory &cat = (*catFunc)(); + if (!cat.isDebugEnabled()) + return; QMessageLogContext ctxt; ctxt.copy(context);