diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-01-30 17:10:22 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-01-30 17:10:25 +0100 |
commit | 1c7a0a3668dacafac41c178d0128fcc741c04ec5 (patch) | |
tree | 9ffe5ec501218ba0074bba3f769aa99874cb4fda /sources/pyside2/PySide2 | |
parent | 34e6ac44ef6d322760fcda02136b25a097b0fe15 (diff) | |
parent | 53a794cb20d00f1b84e601440c32d22e4397d27b (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I2ff686b941af97eca2d056f691530c969a7de701
Diffstat (limited to 'sources/pyside2/PySide2')
5 files changed, 123 insertions, 6 deletions
diff --git a/sources/pyside2/PySide2/QtRemoteObjects/CMakeLists.txt b/sources/pyside2/PySide2/QtRemoteObjects/CMakeLists.txt new file mode 100644 index 000000000..29b49d895 --- /dev/null +++ b/sources/pyside2/PySide2/QtRemoteObjects/CMakeLists.txt @@ -0,0 +1,44 @@ +project(QtRemoteObjects) + +set(QtRemoteObjects_SRC +${QtRemoteObjects_GEN_DIR}/qabstractitemmodelreplica_wrapper.cpp +${QtRemoteObjects_GEN_DIR}/qremoteobjectabstractpersistedstore_wrapper.cpp +${QtRemoteObjects_GEN_DIR}/qremoteobjectdynamicreplica_wrapper.cpp +${QtRemoteObjects_GEN_DIR}/qremoteobjecthost_wrapper.cpp +${QtRemoteObjects_GEN_DIR}/qremoteobjecthostbase_wrapper.cpp +${QtRemoteObjects_GEN_DIR}/qremoteobjectnode_wrapper.cpp +${QtRemoteObjects_GEN_DIR}/qremoteobjectpendingcall_wrapper.cpp +${QtRemoteObjects_GEN_DIR}/qremoteobjectpendingcallwatcher_wrapper.cpp +${QtRemoteObjects_GEN_DIR}/qremoteobjectregistry_wrapper.cpp +${QtRemoteObjects_GEN_DIR}/qremoteobjectregistryhost_wrapper.cpp +${QtRemoteObjects_GEN_DIR}/qremoteobjectreplica_wrapper.cpp +# ${QtRemoteObjects_GEN_DIR}/qtremoteobjects_wrapper.cpp +${QtRemoteObjects_GEN_DIR}/qremoteobjectsettingsstore_wrapper.cpp + +# module is always needed +${QtRemoteObjects_GEN_DIR}/qtremoteobjects_module_wrapper.cpp +) + +set(QtRemoteObjects_include_dirs ${QtRemoteObjects_SOURCE_DIR} + ${QtRemoteObjects_BINARY_DIR} + ${Qt5RemoteObjects_INCLUDE_DIRS} + ${SHIBOKEN_INCLUDE_DIR} + ${libpyside_SOURCE_DIR} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} + ${QtCore_GEN_DIR}) + +set(QtRemoteObjects_libraries pyside2 + ${SHIBOKEN_PYTHON_LIBRARIES} + ${SHIBOKEN_LIBRARY} + ${Qt5RemoteObjects_LIBRARIES}) + +set(QtRemoteObjects_deps QtCore QtNetwork) + +create_pyside_module(NAME QtRemoteObjects + INCLUDE_DIRS QtRemoteObjects_include_dirs + LIBRARIES QtRemoteObjects_libraries + DEPS QtRemoteObjects_deps + TYPESYSTEM_PATH QtRemoteObjects_SOURCE_DIR + SOURCES QtRemoteObjects_SRC + TYPESYSTEM_NAME ${QtRemoteObjects_BINARY_DIR}/typesystem_remoteobjects.xml + ) diff --git a/sources/pyside2/PySide2/QtRemoteObjects/typesystem_remoteobjects.xml b/sources/pyside2/PySide2/QtRemoteObjects/typesystem_remoteobjects.xml new file mode 100644 index 000000000..8058cb56c --- /dev/null +++ b/sources/pyside2/PySide2/QtRemoteObjects/typesystem_remoteobjects.xml @@ -0,0 +1,74 @@ +<?xml version="1.0"?> +<!-- +/**************************************************************************** +** +** Copyright (C) 2019 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.QtRemoteObjects"> + <load-typesystem name="templates/core_common.xml" generate="no"/> + <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> + <rejection class="*" function-name="getTypeNameAndMetaobjectFromClassInfo"/> +<!-- Exclude namespace due to Q_NAMESPACE link errors on Windows (QTBUG-68014) + <rejection class="QtRemoteObjects" field-name="staticMetaObject"/> + <namespace-type name="QtRemoteObjects"> + <enum-type name="InitialAction"/> + <enum-type name="QRemoteObjectPacketTypeEnum"/> + </namespace-type> +--> + <object-type name="QAbstractItemModelReplica"/> + <object-type name="QRemoteObjectAbstractPersistedStore"/> + <object-type name="QRemoteObjectDynamicReplica"/> + <object-type name="QRemoteObjectHost"/> + <object-type name="QRemoteObjectHostBase"> + <enum-type name="AllowedSchemas"/> + </object-type> + <object-type name="QRemoteObjectNode"> + <enum-type name="ErrorCode"/> + </object-type> + <object-type name="QRemoteObjectPendingCall"> + <enum-type name="Error"/> + </object-type> + <object-type name="QRemoteObjectPendingCallWatcher"/> + <object-type name="QRemoteObjectRegistry"/> + <object-type name="QRemoteObjectRegistryHost"/> + <object-type name="QRemoteObjectReplica"> + <enum-type name="State"/> + <!-- protected: <enum-type name="ConstructorType"/> --> + </object-type> + <object-type name="QRemoteObjectSettingsStore"/> +</typesystem> diff --git a/sources/pyside2/PySide2/QtWebEngineWidgets/CMakeLists.txt b/sources/pyside2/PySide2/QtWebEngineWidgets/CMakeLists.txt index 7711aecbc..68b0a632f 100644 --- a/sources/pyside2/PySide2/QtWebEngineWidgets/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtWebEngineWidgets/CMakeLists.txt @@ -3,7 +3,7 @@ project(QtWebEngineWidgets) set(QtWebEngineWidgets_SRC ${QtWebEngineWidgets_GEN_DIR}/qwebenginecertificateerror_wrapper.cpp ${QtWebEngineWidgets_GEN_DIR}/qwebenginedownloaditem_wrapper.cpp -#${QtWebEngineWidgets_GEN_DIR}/qwebenginehistory_wrapper.cpp +${QtWebEngineWidgets_GEN_DIR}/qwebenginehistory_wrapper.cpp ${QtWebEngineWidgets_GEN_DIR}/qwebenginehistoryitem_wrapper.cpp ${QtWebEngineWidgets_GEN_DIR}/qwebenginepage_wrapper.cpp ${QtWebEngineWidgets_GEN_DIR}/qwebengineprofile_wrapper.cpp diff --git a/sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml b/sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml index b8546d824..dfe4e0d7a 100644 --- a/sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml +++ b/sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml @@ -58,10 +58,8 @@ <enum-type name="SavePageFormat"/> </object-type> - <!-- TODO: Deal with private constructor - <value-type name="QWebEngineHistory"/> --> - - <object-type name="QWebEngineHistoryItem"/> + <object-type name="QWebEngineHistory"/> + <value-type name="QWebEngineHistoryItem"/> <object-type name="QWebEnginePage"> <enum-type name="WebAction"/> diff --git a/sources/pyside2/PySide2/glue/qtcore.cpp b/sources/pyside2/PySide2/glue/qtcore.cpp index 4c77e9e87..ca88b9740 100644 --- a/sources/pyside2/PySide2/glue/qtcore.cpp +++ b/sources/pyside2/PySide2/glue/qtcore.cpp @@ -924,7 +924,8 @@ if (PyIndex_Check(_key)) { } if (step != 1 && value_length != slicelength) { - PyErr_Format(PyExc_ValueError, "attempt to assign %s of size %d to extended slice of size %d",Py_TYPE(_value)->tp_name, value_length, slicelength); + PyErr_Format(PyExc_ValueError, "attempt to assign %s of size %d to extended slice of size %d", + Py_TYPE(_value)->tp_name, int(value_length), int(slicelength)); return -1; } |