diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-04 08:15:17 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-04 08:29:54 +0000 |
commit | 9768da0be5a09632c60c4e4035fa52b9c55376df (patch) | |
tree | d9e0d8545e08597f208cda183787b51028fa0680 /sources/pyside2/PySide2 | |
parent | f47818b5c710aa6ae5f76809046105cb8c3d9f7f (diff) |
Remove QtScript, QtXmlPatterns
They are obsolete in Qt 6.
Task-number: PYSIDE-1339
Task-number: PYSIDE-904
Change-Id: I70816b3c3270a1db65ad3b3871a09c62d31420e5
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/pyside2/PySide2')
8 files changed, 0 insertions, 409 deletions
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index 678983a50..d7eaf84d6 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -514,15 +514,11 @@ <rejection class="" enum-name="enum_1"/> <rejection class="" enum-name="enum_2"/> <rejection class="" enum-name="QtValidLicenseForXmlModule"/> - <rejection class="" enum-name="QtValidLicenseForXmlPatternsModule"/> <rejection class="" enum-name="QtValidLicenseForActiveQtModule"/> <rejection class="" enum-name="QtValidLicenseForCoreModule"/> - <rejection class="" enum-name="QtValidLicenseForQt3SupportLightModule"/> - <rejection class="" enum-name="QtValidLicenseForQt3SupportModule"/> <rejection class="" enum-name="QtValidLicenseForNetworkModule"/> <rejection class="" enum-name="QtValidLicenseForSvgModule"/> <rejection class="" enum-name="QtValidLicenseForGuiModule"/> - <rejection class="" enum-name="QtValidLicenseForScriptModule"/> <rejection class="" enum-name="QtValidLicenseForHelpModule"/> <!-- Internal --> <rejection class="QAbstractFileEngine"/> <!-- diff --git a/sources/pyside2/PySide2/QtScript/CMakeLists.txt b/sources/pyside2/PySide2/QtScript/CMakeLists.txt deleted file mode 100644 index 81d6c03d3..000000000 --- a/sources/pyside2/PySide2/QtScript/CMakeLists.txt +++ /dev/null @@ -1,42 +0,0 @@ -project(QtScript) - -set(QtScript_SRC -${QtScript_GEN_DIR}/qscriptable_wrapper.cpp -${QtScript_GEN_DIR}/qscriptclass_wrapper.cpp -${QtScript_GEN_DIR}/qscriptclasspropertyiterator_wrapper.cpp -${QtScript_GEN_DIR}/qscriptcontext_wrapper.cpp -${QtScript_GEN_DIR}/qscriptcontextinfo_wrapper.cpp -${QtScript_GEN_DIR}/qscriptengineagent_wrapper.cpp -${QtScript_GEN_DIR}/qscriptprogram_wrapper.cpp -${QtScript_GEN_DIR}/qscriptengine_wrapper.cpp -${QtScript_GEN_DIR}/qscriptextensioninterface_wrapper.cpp -${QtScript_GEN_DIR}/qscriptextensionplugin_wrapper.cpp -${QtScript_GEN_DIR}/qscriptstring_wrapper.cpp -${QtScript_GEN_DIR}/qscriptvalue_wrapper.cpp -${QtScript_GEN_DIR}/qscriptvalueiterator_wrapper.cpp -# module is always needed -${QtScript_GEN_DIR}/qtscript_module_wrapper.cpp -) - -set(QtScript_glue_sources - "${QtScript_SOURCE_DIR}/qscript_value_iterator_glue.cpp" -) - -set(QtScript_include_dirs ${QtScript_SOURCE_DIR} - ${QtScript_BINARY_DIR} - ${Qt${QT_MAJOR_VERSION}Core_INCLUDE_DIRS} - ${Qt${QT_MAJOR_VERSION}Script_INCLUDE_DIRS} - ${libpyside_SOURCE_DIR} - ${QtCore_GEN_DIR} - ) -set(QtScript_libraries pyside2 - ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Script_LIBRARIES}) -set(QtScript_deps QtCore) -create_pyside_module(NAME QtScript - INCLUDE_DIRS QtScript_include_dirs - LIBRARIES QtScript_libraries - DEPS QtScript_deps - TYPESYSTEM_PATH QtScript_SOURCE_DIR - SOURCES QtScript_SRC - GLUE_SOURCES QtScript_glue_sources) diff --git a/sources/pyside2/PySide2/QtScript/qscript_value_iterator_glue.cpp b/sources/pyside2/PySide2/QtScript/qscript_value_iterator_glue.cpp deleted file mode 100644 index 11dfd19b0..000000000 --- a/sources/pyside2/PySide2/QtScript/qscript_value_iterator_glue.cpp +++ /dev/null @@ -1,3 +0,0 @@ -%PYARG_0 = Shiboken::Object::newObject( - reinterpret_cast<SbkObjectType *>(Shiboken::SbkType< ::QScriptValueIterator >()), - new QScriptValueIterator(*%CPPSELF), true, true); diff --git a/sources/pyside2/PySide2/QtScript/typesystem_script.xml b/sources/pyside2/PySide2/QtScript/typesystem_script.xml deleted file mode 100644 index 1fdad5d47..000000000 --- a/sources/pyside2/PySide2/QtScript/typesystem_script.xml +++ /dev/null @@ -1,105 +0,0 @@ -<?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$ -** -****************************************************************************/ ---> -<typesystem package="PySide2.QtScript"> - <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> - - <object-type name="QScriptable"/> - <object-type name="QScriptClass"> - <enum-type name="Extension"/> - <enum-type name="QueryFlag"/> - </object-type> - <object-type name="QScriptClassPropertyIterator"/> - <object-type name="QScriptContext"> - <enum-type name="Error"/> - <enum-type name="ExecutionState"/> - </object-type> - <value-type name="QScriptContextInfo"> - <enum-type name="FunctionType"/> - </value-type> - <object-type name="QScriptEngineAgent"> - <enum-type name="Extension"/> - </object-type> - <object-type name="QScriptEngine"> - <enum-type name="QObjectWrapOption" flags="QObjectWrapOptions"/> - <enum-type name="ValueOwnership"/> - <!-- Not supported BUG #957--> - <modify-function signature="scriptValueFromQMetaObject()" remove="all"/> - </object-type> - <object-type name="QScriptExtensionInterface"/> - <object-type name="QScriptExtensionPlugin"/> - <value-type name="QScriptProgram" since="4.7"/> - <value-type name="QScriptString"> - <modify-function signature="toArrayIndex(bool*)const"> - <modify-argument index="1"> - <remove-argument/> - </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="fix_bool*"/> - </inject-code> - </modify-function> - </value-type> - <value-type name="QScriptValue"> - <enum-type name="PropertyFlag" flags="PropertyFlags"/> - <enum-type name="ResolveFlag" flags="ResolveFlags"/> - <enum-type name="SpecialValue"/> - <add-function signature="__repr__" return-type="PyObject*"> - <inject-code class="target" position="beginning" file="../glue/qtscript.cpp" snippet="qscriptvalue-repr"/> - </add-function> - <add-function signature="__mgetitem__"> - <inject-code file="../glue/qtscript.cpp" snippet="qscriptvalue-mgetitem"/> - </add-function> - <add-function signature="__iter__()" return-type="PyObject*"> - <inject-code file="qscript_value_iterator_glue.cpp"/> - </add-function> - </value-type> - <object-type name="QScriptValueIterator"> - <add-function signature="__iter__()" return-type="PyObject*"> - <inject-code> - <insert-template name="__iter__"/> - </inject-code> - </add-function> - <add-function signature="__next__()" return-type="PyObject*"> - <inject-code file="../glue/qtscript.cpp" snippet="qscriptvalueiterator-next"/> - </add-function> - </object-type> -</typesystem> - diff --git a/sources/pyside2/PySide2/QtScriptTools/CMakeLists.txt b/sources/pyside2/PySide2/QtScriptTools/CMakeLists.txt deleted file mode 100644 index 7c19856cb..000000000 --- a/sources/pyside2/PySide2/QtScriptTools/CMakeLists.txt +++ /dev/null @@ -1,37 +0,0 @@ -project(QtScriptTools) - -set(QtScriptTools_SRC -${QtScriptTools_GEN_DIR}/qscriptenginedebugger_wrapper.cpp -# module is always needed -${QtScriptTools_GEN_DIR}/qtscripttools_module_wrapper.cpp -) - -set(QtScriptTools_include_dirs ${QtScriptTools_SOURCE_DIR} - ${QtScriptTools_BINARY_DIR} - ${Qt${QT_MAJOR_VERSION}Core_INCLUDE_DIRS} - ${Qt${QT_MAJOR_VERSION}Gui_INCLUDE_DIRS} - ${Qt${QT_MAJOR_VERSION}Widgets_INCLUDE_DIRS} - ${Qt${QT_MAJOR_VERSION}Script_INCLUDE_DIRS} - ${Qt${QT_MAJOR_VERSION}ScriptTools_INCLUDE_DIRS} - ${libpyside_SOURCE_DIR} - ${QtCore_GEN_DIR} - ${QtGui_GEN_DIR} - ${QtWidgets_GEN_DIR} - ${QtScript_GEN_DIR} - ) - -set(QtScriptTools_libraries pyside2 - ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Widgets_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Script_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}ScriptTools_LIBRARIES}) - -set(QtScriptTools_deps QtCore QtScript QtGui QtWidgets) - -create_pyside_module(NAME QtScriptTools - INCLUDE_DIRS QtScriptTools_include_dirs - LIBRARIES QtScriptTools_libraries - DEPS QtScriptTools_deps - TYPESYSTEM_PATH QtScriptTools_SOURCE_DIR - SOURCES QtScriptTools_SRC) diff --git a/sources/pyside2/PySide2/QtScriptTools/typesystem_scripttools.xml b/sources/pyside2/PySide2/QtScriptTools/typesystem_scripttools.xml deleted file mode 100644 index eefa09a54..000000000 --- a/sources/pyside2/PySide2/QtScriptTools/typesystem_scripttools.xml +++ /dev/null @@ -1,55 +0,0 @@ -<?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$ -** -****************************************************************************/ ---> -<typesystem package="PySide2.QtScriptTools"> - <load-typesystem name="QtScript/typesystem_script.xml" generate="no"/> - <load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/> - <load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no"/> - - <object-type name="QScriptEngineDebugger"> - <enum-type name="DebuggerAction"/> - <enum-type name="DebuggerState" since="4.6"/> - <enum-type name="DebuggerWidget"/> - <extra-includes> - <include file-name="QScriptEngine" location="global"/> - </extra-includes> - </object-type> -</typesystem> diff --git a/sources/pyside2/PySide2/QtXmlPatterns/CMakeLists.txt b/sources/pyside2/PySide2/QtXmlPatterns/CMakeLists.txt deleted file mode 100644 index adc1be516..000000000 --- a/sources/pyside2/PySide2/QtXmlPatterns/CMakeLists.txt +++ /dev/null @@ -1,41 +0,0 @@ -project(QtXmlPatterns) - -set(QtXmlPatterns_SRC -${QtXmlPatterns_GEN_DIR}/qabstractmessagehandler_wrapper.cpp -${QtXmlPatterns_GEN_DIR}/qabstracturiresolver_wrapper.cpp -${QtXmlPatterns_GEN_DIR}/qabstractxmlnodemodel_wrapper.cpp -${QtXmlPatterns_GEN_DIR}/qabstractxmlreceiver_wrapper.cpp -${QtXmlPatterns_GEN_DIR}/qsourcelocation_wrapper.cpp -${QtXmlPatterns_GEN_DIR}/qxmlformatter_wrapper.cpp -${QtXmlPatterns_GEN_DIR}/qxmlitem_wrapper.cpp -${QtXmlPatterns_GEN_DIR}/qxmlnamepool_wrapper.cpp -${QtXmlPatterns_GEN_DIR}/qxmlname_wrapper.cpp -${QtXmlPatterns_GEN_DIR}/qxmlnodemodelindex_wrapper.cpp -${QtXmlPatterns_GEN_DIR}/qxmlquery_wrapper.cpp -${QtXmlPatterns_GEN_DIR}/qxmlresultitems_wrapper.cpp -${QtXmlPatterns_GEN_DIR}/qxmlschemavalidator_wrapper.cpp -${QtXmlPatterns_GEN_DIR}/qxmlschema_wrapper.cpp -${QtXmlPatterns_GEN_DIR}/qxmlserializer_wrapper.cpp -## always needed -${QtXmlPatterns_GEN_DIR}/qtxmlpatterns_module_wrapper.cpp -) - -set(QtXmlPatterns_include_dirs ${QtXmlPatterns_SOURCE_DIR} - ${QtXmlPatterns_BINARY_DIR} - ${Qt${QT_MAJOR_VERSION}Core_INCLUDE_DIRS} - ${Qt${QT_MAJOR_VERSION}XmlPatterns_INCLUDE_DIRS} - ${libpyside_SOURCE_DIR} - ${QtCore_GEN_DIR} - ) -set(QtXmlPatterns_libraries pyside2 - ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}XmlPatterns_LIBRARIES}) -set(QtXmlPatterns_deps QtCore) - -create_pyside_module(NAME QtXmlPatterns - INCLUDE_DIRS QtXmlPatterns_include_dirs - LIBRARIES QtXmlPatterns_libraries - DEPS QtXmlPatterns_deps - TYPESYSTEM_PATH QtXmlPatterns_SOURCE_DIR - SOURCES QtXmlPatterns_SRC) - diff --git a/sources/pyside2/PySide2/QtXmlPatterns/typesystem_xmlpatterns.xml b/sources/pyside2/PySide2/QtXmlPatterns/typesystem_xmlpatterns.xml deleted file mode 100644 index 1e8eec083..000000000 --- a/sources/pyside2/PySide2/QtXmlPatterns/typesystem_xmlpatterns.xml +++ /dev/null @@ -1,122 +0,0 @@ -<?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$ -** -****************************************************************************/ ---> -<typesystem package="PySide2.QtXmlPatterns"> - <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> - - <object-type name="QXmlSchema" since="4.6"/> <!-- Qt scoped pointer does not allow declare this as value type --> - <object-type name="QXmlSchemaValidator" since="4.6"> - <modify-function signature="schema()const"> - <modify-argument index="return"> - <replace-type modified-type="QXmlSchema*"/> - <define-ownership owner="target"/> - </modify-argument> - <inject-code file="../glue/qtxmlpatterns.cpp" snippet="qxmlschemavalidator-schema"/> - </modify-function> - </object-type> - <object-type name="QAbstractMessageHandler"/> - <object-type name="QAbstractUriResolver"/> - <object-type name="QAbstractXmlNodeModel"> - <enum-type name="NodeCopySetting"/> - <enum-type name="SimpleAxis"/> - </object-type> - <object-type name="QAbstractXmlReceiver"/> - <value-type name="QSourceLocation"/> - <object-type name="QXmlFormatter"/> - <value-type name="QXmlItem"/> - <value-type name="QXmlName"> - <primitive-type name="NamespaceCode"/> - <primitive-type name="PrefixCode"/> - <primitive-type name="LocalNameCode"/> - <!-- ### These methods aren't part of Qt public API --> - <modify-function signature="QXmlName(QXmlName::NamespaceCode,QXmlName::LocalNameCode,QXmlName::PrefixCode)" remove="all"/> - <modify-function signature="setNamespaceURI(QXmlName::NamespaceCode)" remove="all"/> - <modify-function signature="localName()const" remove="all"/> - <modify-function signature="prefix()const" remove="all"/> - <modify-function signature="hasPrefix()const" remove="all"/> - <modify-function signature="hasNamespace()const" remove="all"/> - <modify-function signature="namespaceURI()const" remove="all"/> - <modify-function signature="isLexicallyEqual(const QXmlName&)const" remove="all"/> - <modify-function signature="setPrefix(QXmlName::PrefixCode)" remove="all"/> - <modify-function signature="setLocalName(QXmlName::LocalNameCode)" remove="all"/> - <modify-function signature="code()const" remove="all"/> - <!-- ### --> - </value-type> - <value-type name="QXmlNamePool"/> - - <rejection class="QXmlNodeModelIndex" function-name="type"/> - <rejection class="QXmlNodeModelIndex" function-name="sequencedTypedValue"/> - <rejection class="QXmlNodeModelIndex" function-name="iterate"/> - <!-- ### This enum isn't part of Qt public API --> - <suppress-warning text="Enum 'QXmlNodeModelIndex::Axis' (class: QXmlNodeModelIndex) does not have a type entry"/> - <value-type name="QXmlNodeModelIndex"> - <enum-type name="DocumentOrder"/> - <enum-type name="NodeKind"/> - <!-- ### Qt internal methods --> - <modify-function signature="name()const" remove="all"/> - <modify-function signature="root()const" remove="all"/> - <modify-function signature="documentUri()const" remove="all"/> - <modify-function signature="baseUri()const" remove="all"/> - <modify-function signature="kind()const" remove="all"/> - <modify-function signature="isDeepEqual(const QXmlNodeModelIndex&)const" remove="all"/> - <modify-function signature="compareOrder(const QXmlNodeModelIndex &)const" remove="all"/> - <modify-function signature="sendNamespaces(QAbstractXmlReceiver*const)const" remove="all"/> - <modify-function signature="namespaceBindings()const" remove="all"/> - <modify-function signature="namespaceForPrefix(QXmlName::PrefixCode)const" remove="all"/> - <modify-function signature="stringValue()const" remove="all"/> - <modify-function signature="is(const QXmlNodeModelIndex &)const" remove="all"/> - <modify-function signature="reset()" remove="all"/> - <!-- ### --> - </value-type> - - <value-type name="QXmlQuery"> - <!-- ### TODO: must evaluate if anything other than removal is needed. --> - <enum-type name="QueryLanguage"/> - <modify-function signature="evaluateTo(QStringList*)const" remove="all"/> - <modify-function signature="evaluateTo(QString*)const" remove="all"/> - <!-- ### --> - </value-type> - <object-type name="QXmlResultItems"/> - <object-type name="QXmlSerializer"/> - - <suppress-warning text="class 'QAbstractXmlNodeModel' inherits from unknown base class 'QSharedData'"/> - <suppress-warning text="class not found for setup inheritance 'QSharedData'"/> -</typesystem> |