qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tracepointgen: handle windows absolute paths 

Handle windows absolute paths when recursively searching include files.

Fixes: QTBUG-140058
Pick-to: 6.10
Change-Id: Ie21a083f50602357efaa2c8d0ac87348a27fd129
Reviewed-by: Janne Roine <janne.roine@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
This commit is contained in:
Antti Määttä 2025-09-10 09:06:04 +03:00
parent d95bc3bf9a
commit 5f92047b6e
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tools/tracepointgen/parser.cpp
View File

@ -416,9 +416,8 @@ void Parser::parseMetadata(const QString &data, qsizetype offset, const QStringL
if (values.isEmpty()) {
if (flags && name.endsWith(QLatin1Char('s')))
values = findEnumValues(name.left(name.length() - 1), includes);
if (values.isEmpty()) {
DEBUGPRINTF(printf("Unable to find values for %s\n", qPrintable(name)));
}
if (values.isEmpty())
panic("Unable to find values for %s\n", qPrintable(name));
}
if (!values.isEmpty()) {
auto moreValues = enumsToValues(values);
@ -505,7 +504,7 @@ void Parser::addIncludesRecursive(const QString &filename, QList<QString> &inclu
data += line + QLatin1Char(QLatin1Char('\n'));
}
QRegularExpression includeMacro(QStringLiteral("#include [\"<]([A-Za-z0-9_./-]*.h)[\">]"));
QRegularExpression includeMacro(QStringLiteral("#include [\"<]([A-Za-z0-9_./-:]*.h)[\">]"));
QRegularExpressionMatchIterator i = includeMacro.globalMatch(data);
while (i.hasNext()) {
QRegularExpressionMatch match = i.next();
@ -549,7 +548,7 @@ void Parser::parse(QIODevice &input, const QString &name)
QStringList includes;
QRegularExpression includeMacro(QStringLiteral("#include [\"<]([A-Za-z0-9_./-]*.h)[\">]"));
QRegularExpression includeMacro(QStringLiteral("#include [\"<]([A-Za-z0-9_./-:]*.h)[\">]"));
QRegularExpressionMatchIterator i = includeMacro.globalMatch(data);
while (i.hasNext()) {
QRegularExpressionMatch match = i.next();