From 5dbb9dd3524c54f871b7634b3ae9a2313dd57d30 Mon Sep 17 00:00:00 2001 From: Christian Tismer Date: Thu, 28 Sep 2017 03:32:10 +0200 Subject: 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 --- .../pyside2/PySide2/support/signature/inspect.py | 39 ++++++++++++++++++++++ .../pyside2/PySide2/support/signature/typing.py | 39 ++++++++++++++++++++++ .../shiboken2/generator/shiboken2/cppgenerator.cpp | 15 ++------- 3 files changed, 80 insertions(+), 13 deletions(-) (limited to 'sources') diff --git a/sources/pyside2/PySide2/support/signature/inspect.py b/sources/pyside2/PySide2/support/signature/inspect.py index 23554d40a..b59368229 100644 --- a/sources/pyside2/PySide2/support/signature/inspect.py +++ b/sources/pyside2/PySide2/support/signature/inspect.py @@ -1,6 +1,45 @@ # This Python file uses the following encoding: utf-8 # It has been edited by fix-complaints.py . +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of PySide2. +## +## $QT_BEGIN_LICENSE:LGPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 3 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL3 included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 3 requirements +## will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 2.0 or (at your option) the GNU General +## Public license version 3 or any later version approved by the KDE Free +## Qt Foundation. The licenses are as published by the Free Software +## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-2.0.html and +## https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + """ PSF LICENSE AGREEMENT FOR PYTHON 3.6.2¶ 1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"), and diff --git a/sources/pyside2/PySide2/support/signature/typing.py b/sources/pyside2/PySide2/support/signature/typing.py index 96e4f81c8..512b9ffe5 100644 --- a/sources/pyside2/PySide2/support/signature/typing.py +++ b/sources/pyside2/PySide2/support/signature/typing.py @@ -1,6 +1,45 @@ # This Python file uses the following encoding: utf-8 # It has been edited by fix-complaints.py . +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of PySide2. +## +## $QT_BEGIN_LICENSE:LGPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 3 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL3 included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 3 requirements +## will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 2.0 or (at your option) the GNU General +## Public license version 3 or any later version approved by the KDE Free +## Qt Foundation. The licenses are as published by the Free Software +## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-2.0.html and +## https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + """ PSF LICENSE AGREEMENT FOR PYTHON 3.6.2¶ 1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"), and 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; -- cgit v1.2.3