aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2021-07-19 11:45:44 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-07-20 20:09:13 +0000
commit4c9490b4c2a86418ddb49705344330352a2e0e02 (patch)
treea3be489a72aa328de1d558896fb03b06fced6544
parent019ba18c20b7d24a660a4bf9eb2d52298aae1d39 (diff)
shiboken6: Shorten debug output of AbstractMetaType/OverloadData
Change-Id: I45656ce217ac87f00241abe6422f4d440c4ee6f0 Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 36aa3df2adf799240070570f29946d39104f9aea) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--sources/shiboken6/ApiExtractor/abstractmetatype.cpp2
-rw-r--r--sources/shiboken6/generator/shiboken/overloaddata.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/sources/shiboken6/ApiExtractor/abstractmetatype.cpp b/sources/shiboken6/ApiExtractor/abstractmetatype.cpp
index 990d1ec07..075315d58 100644
--- a/sources/shiboken6/ApiExtractor/abstractmetatype.cpp
+++ b/sources/shiboken6/ApiExtractor/abstractmetatype.cpp
@@ -754,7 +754,7 @@ bool AbstractMetaType::isExtendedCppPrimitive() const
void AbstractMetaType::formatDebug(QDebug &debug) const
{
debug << '"' << name() << '"';
- if (debug.verbosity() > 2) {
+ if (debug.verbosity() > 2 && !isVoid()) {
auto te = typeEntry();
debug << ", typeEntry=";
if (debug.verbosity() > 3)
diff --git a/sources/shiboken6/generator/shiboken/overloaddata.cpp b/sources/shiboken6/generator/shiboken/overloaddata.cpp
index d30335a4a..9cc492792 100644
--- a/sources/shiboken6/generator/shiboken/overloaddata.cpp
+++ b/sources/shiboken6/generator/shiboken/overloaddata.cpp
@@ -1012,7 +1012,7 @@ void OverloadData::formatDebug(QDebug &d) const
for (int i = 0; i < count; ++i) {
if (i)
d << '\n';
- d << m_overloads.at(i);
+ d << m_overloads.at(i).data();
}
d.setVerbosity(oldVerbosity);
d << ')';