From c76a91ebdc024e68c87544f00f0d260f0eb3c81f Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 21 Jul 2014 16:47:32 +0200 Subject: Improve debugging output for QLoggingCategory Make sure that the source the rules are loaded from is printed before any syntax errors. Change-Id: Id7ced1a346dd0d8501eab93ac00e1f432ca6b703 Reviewed-by: Oswald Buddenhagen Reviewed-by: hjk --- src/corelib/io/qloggingregistry.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/io/qloggingregistry.cpp b/src/corelib/io/qloggingregistry.cpp index 575150f148..31a54d2d2d 100644 --- a/src/corelib/io/qloggingregistry.cpp +++ b/src/corelib/io/qloggingregistry.cpp @@ -261,12 +261,12 @@ void QLoggingRegistry::init() if (!rulesFilePath.isEmpty()) { QFile file(QFile::decodeName(rulesFilePath)); if (file.open(QIODevice::ReadOnly | QIODevice::Text)) { - QTextStream stream(&file); - QLoggingSettingsParser parser; - parser.setContent(stream); if (qtLoggingDebug()) debugMsg("Loading \"%s\" ...", QDir::toNativeSeparators(file.fileName()).toUtf8().constData()); + QTextStream stream(&file); + QLoggingSettingsParser parser; + parser.setContent(stream); envRules = parser.rules(); } } @@ -285,12 +285,12 @@ void QLoggingRegistry::init() if (!envPath.isEmpty()) { QFile file(envPath); if (file.open(QIODevice::ReadOnly | QIODevice::Text)) { - QTextStream stream(&file); - QLoggingSettingsParser parser; - parser.setContent(stream); if (qtLoggingDebug()) debugMsg("Loading \"%s\" ...", QDir::toNativeSeparators(envPath).toUtf8().constData()); + QTextStream stream(&file); + QLoggingSettingsParser parser; + parser.setContent(stream); configRules = parser.rules(); } } -- cgit v1.2.3