diff options
author | Simo Fält <simo.falt@qt.io> | 2023-02-01 15:24:01 +0200 |
---|---|---|
committer | Simo Fält <simo.falt@qt.io> | 2023-02-01 15:24:01 +0200 |
commit | 4ff8ac45ac541471d5ec967e529e24a6bee87eba (patch) | |
tree | 23149a480cb8dbf15d86e24b2f107a88881ebefb /sources/shiboken2/libshiboken/sbkconverter_p.h | |
parent | d526f801ced4687d5413907a93dedcd782ef72fa (diff) | |
parent | ac0db13c20529d09a715985b2a2d4579f415369c (diff) |
Merge tag 'v5.15.3-lts' into tqtc/lts-5.15-opensource
Qt For Python Release 5.15.3
Change-Id: Ia936efcdfa8196b02528905c12cc7764553d6ca8
Diffstat (limited to 'sources/shiboken2/libshiboken/sbkconverter_p.h')
-rw-r--r-- | sources/shiboken2/libshiboken/sbkconverter_p.h | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/sources/shiboken2/libshiboken/sbkconverter_p.h b/sources/shiboken2/libshiboken/sbkconverter_p.h index d87162071..bb4c303ab 100644 --- a/sources/shiboken2/libshiboken/sbkconverter_p.h +++ b/sources/shiboken2/libshiboken/sbkconverter_p.h @@ -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$ ** ****************************************************************************/ @@ -539,7 +521,7 @@ struct Primitive<std::nullptr_t> : TwoPrimitive<std::nullptr_t> { static PyObject *toPython(const void * /* cppIn */) { - return Py_None; + Py_RETURN_NONE; } static void toCpp(PyObject *, void *cppOut) { |