aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2022-08-17 10:35:04 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2022-08-17 13:46:32 +0200
commitdb143665ff9df2e07cc4d072e88cfe071666c63f (patch)
tree67e2e65cc5f1b281534c8d328fbd0f7173d4556a
parent88cf2f648d37b142ee35aecfec16c534a74718a2 (diff)
shiboken6: Trim white space of default expressions
Remove Windows carriage return characters as observed in the signature of QWebEngineView::printToPdf(). Pick-to: 6.3 6.2 Change-Id: I29db24d7407436f9f579684fb6dbce3c1c4cbf7b Reviewed-by: Christian Tismer <tismer@stackless.com>
-rw-r--r--sources/shiboken6/ApiExtractor/clangparser/clangbuilder.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/sources/shiboken6/ApiExtractor/clangparser/clangbuilder.cpp b/sources/shiboken6/ApiExtractor/clangparser/clangbuilder.cpp
index bc27240df..232a9ce40 100644
--- a/sources/shiboken6/ApiExtractor/clangparser/clangbuilder.cpp
+++ b/sources/shiboken6/ApiExtractor/clangparser/clangbuilder.cpp
@@ -651,8 +651,11 @@ QString BuilderPrivate::cursorValueExpression(BaseVisitor *bv, const CXCursor &c
if (equalSign == std::string::npos)
return QString();
++equalSign;
- return QString::fromLocal8Bit(snippet.data() + equalSign,
- qsizetype(snippet.size() - equalSign)).trimmed();
+ QString result = QString::fromLocal8Bit(snippet.data() + equalSign,
+ qsizetype(snippet.size() - equalSign));
+ // Fix a default expression as read from code. Simplify white space
+ result.remove(u'\r');
+ return result.contains(u'"') ? result.trimmed() : result.simplified();
}
// Resolve a type (loop over aliases/typedefs), for example for base classes