1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change parsing log output in QGtk3Json from qCDebug to qCInfo

Browse Source 
When a palette mapping is imported from a Json file, parsing errors are
logged with qCDebug. This prevents errors from being logged in release
builds.

This patch replaces qCDebug with qCInfo for Json parsing to make errors
visible when the logging category qt.qpa.gtk is activated.

Change-Id: I3f92ecc3ab51f863f62ccef9f9061902320d3c3c
Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
(cherry picked from commit 49a8311ae5f2fb467d43c8e68ab9490efd2e064e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Axel Spoerl 2023-01-03 13:33:37 +01:00 committed by Qt Cherry-pick Bot
parent 3d386dea2c
commit 71e9e2656f
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/platformthemes/gtk3/qgtk3json.cpp
View File

@ -258,7 +258,7 @@ bool QGtk3Json::load(QGtk3Storage::PaletteMap &map, const QJsonDocument &doc)
{ {
#define GETSTR(obj, key)\ #define GETSTR(obj, key)\
if (!obj.contains(key)) {\ if (!obj.contains(key)) {\
qCDebug(lcQGtk3Interface) << key << "missing for palette" << paletteName\ qCInfo(lcQGtk3Interface) << key << "missing for palette" << paletteName\
<< ", Brush" << colorRoleName;\ << ", Brush" << colorRoleName;\
return false;\ return false;\
}\ }\
@ -266,7 +266,7 @@ bool QGtk3Json::load(QGtk3Storage::PaletteMap &map, const QJsonDocument &doc)
#define GETINT(obj, key, var) GETSTR(obj, key);\ #define GETINT(obj, key, var) GETSTR(obj, key);\
if (!obj[key].isDouble()) {\ if (!obj[key].isDouble()) {\
qCDebug(lcQGtk3Interface) << key << "type mismatch" << value\ qCInfo(lcQGtk3Interface) << key << "type mismatch" << value\
<< "is not an integer!"\ << "is not an integer!"\
<< "(Palette" << paletteName << "), Brush" << colorRoleName;\ << "(Palette" << paletteName << "), Brush" << colorRoleName;\
return false;\ return false;\
@ -276,7 +276,7 @@ bool QGtk3Json::load(QGtk3Storage::PaletteMap &map, const QJsonDocument &doc)
map.clear(); map.clear();
const QJsonObject top(doc.object()); const QJsonObject top(doc.object());
if (doc.isEmpty() || top.isEmpty() || !top.contains(cePalettes)) { if (doc.isEmpty() || top.isEmpty() || !top.contains(cePalettes)) {
qCDebug(lcQGtk3Interface) << "Document does not contain Palettes."; qCInfo(lcQGtk3Interface) << "Document does not contain Palettes.";
return false; return false;
} }
@ -286,13 +286,13 @@ bool QGtk3Json::load(QGtk3Storage::PaletteMap &map, const QJsonDocument &doc)
const int intVal = QMetaEnum::fromType<QPlatformTheme::Palette>().keyToValue(paletteName const int intVal = QMetaEnum::fromType<QPlatformTheme::Palette>().keyToValue(paletteName
.toLatin1().constData(), &ok); .toLatin1().constData(), &ok);
if (!ok) { if (!ok) {
qCDebug(lcQGtk3Interface) << "Invalid Palette name:" << paletteName; qCInfo(lcQGtk3Interface) << "Invalid Palette name:" << paletteName;
return false; return false;
} }
const QJsonObject &paletteObject = top[cePalettes][paletteName].toObject(); const QJsonObject &paletteObject = top[cePalettes][paletteName].toObject();
const QStringList &brushList = paletteObject.keys(); const QStringList &brushList = paletteObject.keys();
if (brushList.isEmpty()) { if (brushList.isEmpty()) {
qCDebug(lcQGtk3Interface) << "Palette" << paletteName << "does not contain brushes"; qCInfo(lcQGtk3Interface) << "Palette" << paletteName << "does not contain brushes";
return false; return false;
} }
@ -303,7 +303,7 @@ bool QGtk3Json::load(QGtk3Storage::PaletteMap &map, const QJsonDocument &doc)
const int intVal = QMetaEnum::fromType<QPalette::ColorRole>().keyToValue(colorRoleName const int intVal = QMetaEnum::fromType<QPalette::ColorRole>().keyToValue(colorRoleName
.toLatin1().constData(), &ok); .toLatin1().constData(), &ok);
if (!ok) { if (!ok) {
qCDebug(lcQGtk3Interface) << "Palette" << paletteName qCInfo(lcQGtk3Interface) << "Palette" << paletteName
<< "contains invalid color role" << colorRoleName; << "contains invalid color role" << colorRoleName;
return false; return false;
} }
@ -312,7 +312,7 @@ bool QGtk3Json::load(QGtk3Storage::PaletteMap &map, const QJsonDocument &doc)
for (int brushIndex = 0; brushIndex < brushArray.size(); ++brushIndex) { for (int brushIndex = 0; brushIndex < brushArray.size(); ++brushIndex) {
const QJsonObject brushObject = brushArray.at(brushIndex).toObject(); const QJsonObject brushObject = brushArray.at(brushIndex).toObject();
if (brushObject.isEmpty()) { if (brushObject.isEmpty()) {
qCDebug(lcQGtk3Interface) << "Brush specification missing at for palette" qCInfo(lcQGtk3Interface) << "Brush specification missing at for palette"
<< paletteName << ", Brush" << colorRoleName; << paletteName << ", Brush" << colorRoleName;
return false; return false;
} }
@ -328,7 +328,7 @@ bool QGtk3Json::load(QGtk3Storage::PaletteMap &map, const QJsonDocument &doc)
QGtk3Storage::Source s; QGtk3Storage::Source s;
if (!brushObject.contains(ceData) || !brushObject[ceData].isObject()) { if (!brushObject.contains(ceData) || !brushObject[ceData].isObject()) {
qCDebug(lcQGtk3Interface) << "Source specification missing for palette" << paletteName qCInfo(lcQGtk3Interface) << "Source specification missing for palette" << paletteName
<< "Brush" << colorRoleName; << "Brush" << colorRoleName;
return false; return false;
} }
@ -350,7 +350,7 @@ bool QGtk3Json::load(QGtk3Storage::PaletteMap &map, const QJsonDocument &doc)
case QGtk3Storage::SourceType::Fixed: { case QGtk3Storage::SourceType::Fixed: {
if (!sourceObject.contains(ceBrush)) { if (!sourceObject.contains(ceBrush)) {
qCDebug(lcQGtk3Interface) << "Fixed brush specification missing for palette" << paletteName qCInfo(lcQGtk3Interface) << "Fixed brush specification missing for palette" << paletteName
<< "Brush" << colorRoleName; << "Brush" << colorRoleName;
return false; return false;
} }
@ -360,7 +360,7 @@ bool QGtk3Json::load(QGtk3Storage::PaletteMap &map, const QJsonDocument &doc)
GETSTR(fixedSource, ceColor); GETSTR(fixedSource, ceColor);
const QColor color(value); const QColor color(value);
if (!color.isValid()) { if (!color.isValid()) {
qCDebug(lcQGtk3Interface) << "Color" << value << "can't be parsed for:" << paletteName qCInfo(lcQGtk3Interface) << "Color" << value << "can't be parsed for:" << paletteName
<< "Brush" << colorRoleName; << "Brush" << colorRoleName;
return false; return false;
} }
@ -388,7 +388,7 @@ bool QGtk3Json::load(QGtk3Storage::PaletteMap &map, const QJsonDocument &doc)
break; break;
case QGtk3Storage::SourceType::Invalid: case QGtk3Storage::SourceType::Invalid:
qCDebug(lcQGtk3Interface) << "Invalid source type for palette" << paletteName qInfo(lcQGtk3Interface) << "Invalid source type for palette" << paletteName
<< "Brush." << colorRoleName; << "Brush." << colorRoleName;
return false; return false;
} }