From 79ff6fc6b97148310ff40198471f15322caf3639 Mon Sep 17 00:00:00 2001 From: Christian Tismer Date: Wed, 13 Jan 2021 13:49:42 +0100 Subject: signature: Provide fixes and improvements, Part 1 The signature module is modified again to be more correct when using the mypy application. This part splits some changes which occured when working on Shiboken.Enum inheritance. There will be a number of follow-ups: - signatures for all shiboken types - test cases for signatures - signature support for different __feature__ selections This patch will be transferred to dev when it is approved in 5.15. Change-Id: Ifb0d92bf7641f2909ab950e3458b3c3c68c20dad Pick-to: 6.0 Pick-to: 5.15 Task-number: PYSIDE-510 Reviewed-by: Cristian Maureira-Fredes --- sources/pyside2/libpyside/pysideslot.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sources/pyside2/libpyside/pysideslot.cpp') diff --git a/sources/pyside2/libpyside/pysideslot.cpp b/sources/pyside2/libpyside/pysideslot.cpp index 1ec24ab21..7911b21de 100644 --- a/sources/pyside2/libpyside/pysideslot.cpp +++ b/sources/pyside2/libpyside/pysideslot.cpp @@ -183,7 +183,7 @@ namespace PySide { namespace Slot { static const char *Slot_SignatureStrings[] = { - "PySide2.QtCore.Slot(*types:type,name:str=nullptr,result:str=nullptr)->typing.Callable[...,typing.Optional[str]]", + "PySide2.QtCore.Slot(self,*types:type,name:str=nullptr,result:str=nullptr)->typing.Callable[...,typing.Optional[str]]", nullptr}; // Sentinel void init(PyObject *module) -- cgit v1.2.3 From 50c76a779bd1343a60ec091f728586db39067884 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 5 Mar 2021 18:14:27 +0100 Subject: Change the LTS 5.15 branch to a commercial license MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-4142 Change-Id: I15aaa7d4f0a44531de4554bb177dd3ade20f56a6 Reviewed-by: Cristian Maureira-Fredes Reviewed-by: Simo Fält --- sources/pyside2/libpyside/pysideslot.cpp | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) (limited to 'sources/pyside2/libpyside/pysideslot.cpp') diff --git a/sources/pyside2/libpyside/pysideslot.cpp b/sources/pyside2/libpyside/pysideslot.cpp index 7911b21de..7ba4e8687 100644 --- a/sources/pyside2/libpyside/pysideslot.cpp +++ b/sources/pyside2/libpyside/pysideslot.cpp @@ -1,11 +1,12 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of Qt for Python. ** -** $QT_BEGIN_LICENSE:LGPL$ +** $QT_BEGIN_LICENSE:COMM$ +** ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,25 +15,6 @@ ** 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$ ** ****************************************************************************/ -- cgit v1.2.3