From 00213a3a0906f0e1b5fa97a9e8de235a1e3cdcbf Mon Sep 17 00:00:00 2001 From: Cyril Rossi Date: Mon, 3 Feb 2020 13:50:17 +0100 Subject: kconfig_compiler : generate kconfig settings with subgroup Summary: Following D27059, add `parentGroupName` attribute to `group` element to generate kconfig settings with subgroups Reviewers: ervin, dfaure, #frameworks, meven Reviewed By: ervin, meven Subscribers: apol, meven, kde-frameworks-devel Tags: #frameworks Differential Revision: https://phabricator.kde.org/D27133 --- src/kconfig_compiler/KConfigXmlParser.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/kconfig_compiler/KConfigXmlParser.cpp') diff --git a/src/kconfig_compiler/KConfigXmlParser.cpp b/src/kconfig_compiler/KConfigXmlParser.cpp index 46ce0921..3120d006 100644 --- a/src/kconfig_compiler/KConfigXmlParser.cpp +++ b/src/kconfig_compiler/KConfigXmlParser.cpp @@ -344,7 +344,7 @@ void KConfigXmlParser::readParamDefaultValues(CfgEntry &readEntry, const QDomEle } } -CfgEntry *KConfigXmlParser::parseEntry(const QString &group, const QDomElement &element) +CfgEntry *KConfigXmlParser::parseEntry(const QString &group, const QString &parentGroup, const QDomElement &element) { CfgEntry readEntry; readEntry.type = element.attribute(QStringLiteral("type")); @@ -352,6 +352,7 @@ CfgEntry *KConfigXmlParser::parseEntry(const QString &group, const QDomElement & readEntry.key = element.attribute(QStringLiteral("key")); readEntry.hidden = element.attribute(QStringLiteral("hidden")) == QLatin1String("true");; readEntry.group = group; + readEntry.parentGroup = parentGroup; const bool nameIsEmpty = readEntry.name.isEmpty(); @@ -400,6 +401,7 @@ CfgEntry *KConfigXmlParser::parseEntry(const QString &group, const QDomElement & // creating another one to fill the code. CfgEntry *result = new CfgEntry(); result->group = readEntry.group; + result->parentGroup = readEntry.parentGroup; result->type = readEntry.type; result->key = readEntry.key; result->name = readEntry.name; @@ -492,11 +494,13 @@ void KConfigXmlParser::readGroupTag(const QDomElement &e) exit (1); } + const QString parentGroup = e.attribute(QStringLiteral("parentGroupName")); + for (QDomElement e2 = e.firstChildElement(); !e2.isNull(); e2 = e2.nextSiblingElement()) { if (e2.tagName() != QLatin1String("entry")) { continue; } - CfgEntry *entry = parseEntry(group, e2); + CfgEntry *entry = parseEntry(group, parentGroup, e2); if (entry) { mParseResult.entries.append(entry); } else { -- cgit v1.2.1