aboutsummaryrefslogtreecommitdiffstats
path: root/generator/shiboken2/cppgenerator.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2017-05-18 16:32:17 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2017-05-18 16:32:18 +0200
commitb68f2b96866c0422c2c02c9ca93874c0081d857b (patch)
tree6e4ff89b5f20001a4ef2c1d5499a85cf0164744f /generator/shiboken2/cppgenerator.cpp
parentb7567daf8c73aff0decfdf8f16794334a23f5184 (diff)
parentba47a265cc4ea881f758704058ac5bbbb547c4ec (diff)
Merge remote-tracking branch 'origin/5.9' into devHEADdev
Diffstat (limited to 'generator/shiboken2/cppgenerator.cpp')
-rw-r--r--generator/shiboken2/cppgenerator.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/generator/shiboken2/cppgenerator.cpp b/generator/shiboken2/cppgenerator.cpp
index cb432fe..6aa2c83 100644
--- a/generator/shiboken2/cppgenerator.cpp
+++ b/generator/shiboken2/cppgenerator.cpp
@@ -710,7 +710,11 @@ void CppGenerator::writeVirtualMethodNative(QTextStream&s, const AbstractMetaFun
if (defaultReturnExpr.isEmpty())
defaultReturnExpr = minimalConstructor(func->type());
if (defaultReturnExpr.isEmpty()) {
- QString errorMsg = QString::fromLatin1(MIN_CTOR_ERROR_MSG).arg(func->type()->cppSignature());
+ QString errorMsg = QLatin1String(__FUNCTION__) + QLatin1String(": ");
+ if (const AbstractMetaClass *c = func->implementingClass())
+ errorMsg += c->qualifiedCppName() + QLatin1String("::");
+ errorMsg += func->signature();
+ errorMsg = ShibokenGenerator::msgCouldNotFindMinimalConstructor(errorMsg, func->type()->cppSignature());
qCWarning(lcShiboken).noquote().nospace() << errorMsg;
s << endl << INDENT << "#error " << errorMsg << endl;
}