Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: I7e4c7f9378706438715362b1e2da9a3cd2794562

1 files changed, 6 insertions, 4 deletions

diff --git a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
index 831d05d6a..851498f80 100644
--- a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+++ b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
@@ -34,6 +34,7 @@
 #include "overloaddata.h"
 #include <abstractmetalang.h>
 #include <messages.h>
+#include <propertyspec.h>
 #include <reporthandler.h>
 #include <typedatabase.h>
 
@@ -3531,12 +3532,13 @@ void CppGenerator::writeMethodCall(QTextStream &s, const AbstractMetaFunction *f
                     if (!avoidProtectedHack() || !func->isProtected()) {
                         QString virtualCall(methodCall);
                         QString normalCall(methodCall);
-                        virtualCall = virtualCall.replace(QLatin1String("%CLASS_NAME"),
-                                                          methodCallClassName);
+                        virtualCall.replace(QLatin1String("%CLASS_NAME"),
+                                            methodCallClassName);
                         normalCall.remove(QLatin1String("::%CLASS_NAME::"));
                         methodCall.clear();
-                        mc << "Shiboken::Object::hasCppWrapper(reinterpret_cast<SbkObject *>(self)) ? ";
-                        mc << virtualCall << " : " <<  normalCall;
+                        mc << "Shiboken::Object::hasCppWrapper(reinterpret_cast<SbkObject *>(self))\n"
+                            << INDENT << "    ? " << virtualCall << '\n'
+                            << INDENT << "    : " <<  normalCall;
                     }
                 }
             }