diff options
Diffstat (limited to 'sources/pyside6/PySide6/QtSql/typesystem_sql.xml')
| -rw-r--r-- | sources/pyside6/PySide6/QtSql/typesystem_sql.xml | 76 |
1 files changed, 32 insertions, 44 deletions
diff --git a/sources/pyside6/PySide6/QtSql/typesystem_sql.xml b/sources/pyside6/PySide6/QtSql/typesystem_sql.xml index b7747adf0..70c3e6f69 100644 --- a/sources/pyside6/PySide6/QtSql/typesystem_sql.xml +++ b/sources/pyside6/PySide6/QtSql/typesystem_sql.xml @@ -1,50 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt for Python. -** -** $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$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only --> -<typesystem package="PySide6.QtSql"> +<typesystem package="PySide6.QtSql" + namespace-begin="QT_BEGIN_NAMESPACE" namespace-end="QT_END_NAMESPACE"> <load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no"/> <rejection class="QSqlDriverCreator"/> <rejection class="QSqlDriverPlugin"/> - <rejection class="QSqlDriverFactoryInterface"/> <namespace-type name="QSql"> <enum-type name="Location"/> @@ -65,7 +29,10 @@ <include file-name="QStringList" location="global"/> <include file-name="QSize" location="global"/> </extra-includes> - <modify-function signature="exec(QString)const" rename="exec_" allow-thread="yes"/> + <modify-function signature="exec(QString)const" allow-thread="yes"/> + <add-function signature="exec_(QString @query@ = QString())const" return-type="QSqlQuery"> + <inject-code file="../glue/qtsql.cpp" snippet="qsqldatabase-exec"/> + </add-function> <modify-function signature="open()" allow-thread="yes"/> <modify-function signature="open(const QString&, const QString&)" allow-thread="yes"/> <modify-function signature="commit()" allow-thread="yes"/> @@ -86,8 +53,16 @@ <include file-name="QStringList" location="global"/> <include file-name="QSize" location="global"/> </extra-includes> - <modify-function signature="exec()" rename="exec_" allow-thread="yes"/> - <modify-function signature="exec(const QString&)" rename="exec_" allow-thread="yes"/> + <!-- exec() --> + <modify-function signature="exec()" allow-thread="yes"/> + <add-function signature="exec_()" return-type="bool"> + <inject-code file="../glue/qtsql.cpp" snippet="simple-exec"/> + </add-function> + <!-- exec(QString) --> + <modify-function signature="exec(const QString&)" allow-thread="yes"/> + <add-function signature="exec_(const QString&)" return-type="bool"> + <inject-code file="../glue/qtsql.cpp" snippet="qsqlquery-exec"/> + </add-function> <modify-function signature="prepare(const QString&)" allow-thread="yes"/> <modify-function signature="clear()" allow-thread="yes"/> <modify-function signature="last()" allow-thread="yes"/> @@ -148,6 +123,14 @@ <include file-name="QStringList" location="global"/> <include file-name="QSize" location="global"/> </extra-includes> + <!-- FIXME: PYSIDE7: Handle setQuery(QSqlQuery&&) in some way? + QTBUG-91766/PYSIDE-2394. allow-thread for PYSIDE-1931 --> + <modify-function signature="setQuery(QSqlQuery)" allow-thread="yes" + deprecated="false"/> + <modify-function signature="setQuery(QString,QSqlDatabase)" allow-thread="yes"/> + <!-- FIXME: PYSIDE7: Probably needs a fix, make QSqlQuery an object type? + QTBUG-105048/PYSIDE-2300 --> + <declare-function signature="query()" return-type="QSqlQuery"/> </object-type> <object-type name="QSqlRelationalTableModel"> <enum-type name="JoinMode"/> @@ -155,6 +138,7 @@ <include file-name="QStringList" location="global"/> <include file-name="QSize" location="global"/> </extra-includes> + <modify-function signature="select()" allow-thread="yes"/> <!-- PYSIDE-1931 --> </object-type> <object-type name="QSqlResult"> <enum-type name="BindingSyntax"/> @@ -169,7 +153,10 @@ <!-- ### This isn't part of Qt public API --> <modify-function signature="virtual_hook(int,void*)" remove="all"/> <!-- ### --> - <modify-function signature="exec()" rename="exec_" allow-thread="yes"/> + <modify-function signature="exec()" allow-thread="yes"/> + <add-function signature="exec_()" return-type="bool"> + <inject-code file="../glue/qtsql.cpp" snippet="qsqlresult-exec"/> + </add-function> <modify-function signature="fetchLast()" allow-thread="yes"/> <modify-function signature="fetchFirst()" allow-thread="yes"/> <modify-function signature="fetchNext()" allow-thread="yes"/> @@ -184,6 +171,7 @@ <include file-name="QStringList" location="global"/> <include file-name="QSize" location="global"/> </extra-includes> + <modify-function signature="select()" allow-thread="yes"/> <!-- PYSIDE-1931 --> </object-type> <object-type name="QSqlDriverCreatorBase"> <extra-includes> |