diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-08-17 10:35:04 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-08-18 15:43:13 +0000 |
| commit | f5817425ca532f91310bdc55b3f026df4362940a (patch) | |
| tree | 579de5d1d7bfb184db1b4ce4265a70cb2eacd165 | |
| parent | 30c774005405219eda13eb5853652702345a1730 (diff) | |
shiboken6: Trim white space of default expressions
Remove Windows carriage return characters as observed
in the signature of QWebEngineView::printToPdf().
Change-Id: I29db24d7407436f9f579684fb6dbce3c1c4cbf7b
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit db143665ff9df2e07cc4d072e88cfe071666c63f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | sources/shiboken6/ApiExtractor/clangparser/clangbuilder.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sources/shiboken6/ApiExtractor/clangparser/clangbuilder.cpp b/sources/shiboken6/ApiExtractor/clangparser/clangbuilder.cpp index 44f3e97c4..7f9fb42b8 100644 --- a/sources/shiboken6/ApiExtractor/clangparser/clangbuilder.cpp +++ b/sources/shiboken6/ApiExtractor/clangparser/clangbuilder.cpp @@ -676,8 +676,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 |