diff options
author | Christian Tismer <tismer@stackless.com> | 2017-09-28 03:32:10 +0200 |
---|---|---|
committer | Christian Tismer <tismer@stackless.com> | 2017-09-28 01:35:22 +0000 |
commit | 5dbb9dd3524c54f871b7634b3ae9a2313dd57d30 (patch) | |
tree | a93eb67d9a5325f56b779f615784b8500793f20b /sources/shiboken2/generator/shiboken2 | |
parent | 7aa010a0a0526b2cc3b947cfc277dc0da22a8081 (diff) |
Signature: support the new types and constants of 5.9 part 2
This patch reduces the string size a bit to meet the MSVC restriction
to 16k only. This limit is reached by QtGui/qopenglfunctions_wrapper.cpp .
Task-number: PYSIDE-510
Change-Id: Ibb4a9103775cb308a0f39b3375c4948da6016189
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/shiboken2/generator/shiboken2')
-rw-r--r-- | sources/shiboken2/generator/shiboken2/cppgenerator.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp index 6334834d3..9133b05ab 100644 --- a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp +++ b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp @@ -4360,7 +4360,6 @@ void CppGenerator::writeSignatureInfo(QTextStream &s, const AbstractMetaFunction } args << arg->name() + QLatin1Char(':') + strArg; } - s << INDENT; // mark the multiple signatures as such, to make it easier to generate different code if (multiple) s << idx-- << ':'; @@ -4691,17 +4690,12 @@ void CppGenerator::writeClassRegister(QTextStream &s, // PYSIDE-510: Create a signatures string for the introspection feature. s << "// The signatures string for the functions." << endl; s << "// Multiple signatures have their index \"n:\" in front." << endl; -#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) - s << "const char " << initFunctionName << "_SignaturesString[] = R\"\"\"(\n" - << signatureStream.readAll() << ")\"\"\";" << endl << endl; -#else s << "const char " << initFunctionName << "_SignaturesString[] = \"\"" << endl; QString line; while (signatureStream.readLineInto(&line)) { - s << '"' << line << "\\n\"" << endl; + s << INDENT << '"' << line << "\\n\"" << endl; } s << ';' << endl << endl; -#endif s << "void init_" << initFunctionName; s << "(PyObject* " << enclosingObjectVariable << ")" << endl; s << '{' << endl; @@ -5556,17 +5550,12 @@ bool CppGenerator::finishGeneration() // PYSIDE-510: Create a signatures string for the introspection feature. s << "// The signatures string for the global functions." << endl; s << "// Multiple signatures have their index \"n:\" in front." << endl; -#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) - s << "const char " << moduleName() << "_SignaturesString[] = R\"\"\"(\n" - << signatureStream.readAll() << ")\"\"\";" << endl << endl; -#else s << "const char " << moduleName() << "_SignaturesString[] = \"\"" << endl; QString line; while (signatureStream.readLineInto(&line)) { - s << '"' << line << "\\n\"" << endl; + s << INDENT << '"' << line << "\\n\"" << endl; } s << ';' << endl; -#endif // finish the rest of __signature__ initialization. s << INDENT << "FinishSignatureInitialization(module, " << moduleName() << "_SignaturesString);" << endl << endl; |