diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-06 12:59:25 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-06 13:26:37 +0100 |
commit | 06e4edac7133d322fe3398502396e1cd8afd8329 (patch) | |
tree | ba4427a92c4f1eac1963a428a03edf2c0cea4248 /sources/shiboken2/generator/shiboken2 | |
parent | f2063ee4737f90c5d412a9a328672fde32b033eb (diff) | |
parent | 764498b3d033a1c947a40dc1b2237e81b674992b (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: I72583df407fc5b3caa8bf35fd997889a4ac86512
Diffstat (limited to 'sources/shiboken2/generator/shiboken2')
-rw-r--r-- | sources/shiboken2/generator/shiboken2/cppgenerator.cpp | 23 | ||||
-rw-r--r-- | sources/shiboken2/generator/shiboken2/headergenerator.cpp | 2 |
2 files changed, 1 insertions, 24 deletions
diff --git a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp index 98b5ad357..74861e3d4 100644 --- a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp +++ b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp @@ -248,7 +248,6 @@ void CppGenerator::generateClass(QTextStream &s, GeneratorContext &classContext) s << "#include <qapp_macro.h>" << endl; } - s << "#include <typeresolver.h>" << endl; s << "#include <typeinfo>" << endl; if (usePySideExtensions() && metaClass->isQObject()) { s << "#include <signalmanager.h>" << endl; @@ -3565,7 +3564,6 @@ void CppGenerator::writeEnumConverterInitialization(QTextStream& s, const TypeEn } s << INDENT << "Shiboken::Enum::setTypeConverter(" << enumPythonType << ", converter);" << endl; - s << INDENT << "Shiboken::Enum::setTypeConverter(" << enumPythonType << ", converter);" << endl; QStringList cppSignature = enumType->qualifiedCppName().split(QLatin1String("::"), QString::SkipEmptyParts); while (!cppSignature.isEmpty()) { QString signature = cppSignature.join(QLatin1String("::")); @@ -5593,27 +5591,6 @@ bool CppGenerator::finishGeneration() cppSignature.removeFirst(); } } - // Register type resolver for all containers found in signals. - QSet<QByteArray> typeResolvers; - - for (AbstractMetaClass *metaClass : classList) { - if (!metaClass->isQObject() || !metaClass->typeEntry()->generateCode()) - continue; - const AbstractMetaFunctionList &functions = metaClass->functions(); - for (AbstractMetaFunction *func : functions) { - if (func->isSignal()) { - const AbstractMetaArgumentList &arguments = func->arguments(); - for (AbstractMetaArgument *arg : arguments) { - if (arg->type()->isContainer()) { - QString value = translateType(arg->type(), metaClass, ExcludeConst | ExcludeReference); - if (value.startsWith(QLatin1String("::"))) - value.remove(0, 2); - typeResolvers << QMetaObject::normalizedType(value.toUtf8().constData()); - } - } - } - } - } s << endl; if (maxTypeIndex) diff --git a/sources/shiboken2/generator/shiboken2/headergenerator.cpp b/sources/shiboken2/generator/shiboken2/headergenerator.cpp index 9fde98d91..a41139381 100644 --- a/sources/shiboken2/generator/shiboken2/headergenerator.cpp +++ b/sources/shiboken2/generator/shiboken2/headergenerator.cpp @@ -474,7 +474,7 @@ bool HeaderGenerator::finishGeneration() } s << "#include <sbkpython.h>" << endl; - s << "#include <conversions.h>" << endl; + s << "#include <sbkconverter.h>" << endl; s << "#include <sbkenum.h>" << endl; s << "#include <basewrapper.h>" << endl; s << "#include <bindingmanager.h>" << endl; |