diff options
| -rw-r--r-- | src/corelib/global/qlogging.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp index f4fac3f35e..9bb15d21be 100644 --- a/src/corelib/global/qlogging.cpp +++ b/src/corelib/global/qlogging.cpp @@ -1410,7 +1410,10 @@ QString qFormatLogMessage(QtMsgType type, const QMessageLogContext &context, con } else if (token == messageTokenC) { message.append(str); } else if (token == categoryTokenC) { +#ifndef Q_OS_ANDROID + // Don't add the category to the message on Android message.append(QLatin1String(context.category)); +#endif } else if (token == typeTokenC) { switch (type) { case QtDebugMsg: message.append(QLatin1String("debug")); break; @@ -1658,7 +1661,10 @@ static bool android_default_message_handler(QtMsgType type, break; }; - __android_log_print(priority, qPrintable(QCoreApplication::applicationName()), "%s\n", qPrintable(formattedMessage)); + // If a category is defined, use it as an Android logging tag + __android_log_print(priority, isDefaultCategory(context.category) ? + qPrintable(QCoreApplication::applicationName()) : context.category, + "%s\n", qPrintable(formattedMessage)); return true; // Prevent further output to stderr } |