diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-22 16:44:51 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-22 18:22:49 +0200 |
commit | 427c7147d23fa21c6e8bd08407b1badc48b49c3c (patch) | |
tree | d2742c7ffdfa167bcf6e68f06ce7524bc441102d /sources/pyside2/PySide2/QtWebChannel | |
parent | 4ec9cfa3c6b895c0cf50227c189cfa542de88b64 (diff) |
move everying into sources/pyside2 (5.9 edition)
in preparation for a subtree merge.
this should not be necessary to do in a separate commit, but git is a
tad stupid about following history correctly without it.
Diffstat (limited to 'sources/pyside2/PySide2/QtWebChannel')
-rw-r--r-- | sources/pyside2/PySide2/QtWebChannel/CMakeLists.txt | 35 | ||||
-rw-r--r-- | sources/pyside2/PySide2/QtWebChannel/typesystem_webchannel.xml | 55 |
2 files changed, 90 insertions, 0 deletions
diff --git a/sources/pyside2/PySide2/QtWebChannel/CMakeLists.txt b/sources/pyside2/PySide2/QtWebChannel/CMakeLists.txt new file mode 100644 index 000000000..ae292844f --- /dev/null +++ b/sources/pyside2/PySide2/QtWebChannel/CMakeLists.txt @@ -0,0 +1,35 @@ +project(QtWebChannel) + +set(QtWebChannel_SRC +${QtWebChannel_GEN_DIR}/qwebchannel_wrapper.cpp +${QtWebChannel_GEN_DIR}/qwebchannelabstracttransport_wrapper.cpp +# module is always needed +${QtWebChannel_GEN_DIR}/qtwebchannel_module_wrapper.cpp +) + +make_path(QtWebChannel_typesystem_path ${QtCore_SOURCE_DIR} ${QtCore_BINARY_DIR} ${QtWebChannel_SOURCE_DIR}) + +set(QtWebChannel_include_dirs ${QtWebChannel_SOURCE_DIR} + ${QtWebChannel_BINARY_DIR} + ${Qt5Core_INCLUDE_DIRS} + ${Qt5WebChannel_INCLUDE_DIRS} + ${SHIBOKEN_INCLUDE_DIR} + ${libpyside_SOURCE_DIR} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} + ${QtCore_GEN_DIR} + ) +set(QtWebChannel_libraries pyside2 + ${SHIBOKEN_PYTHON_LIBRARIES} + ${SHIBOKEN_LIBRARY} + ${Qt5WebChannel_LIBRARIES} + ${Qt5Core_LIBRARIES} + ) +set(QtWebChannel_deps QtCore) + +create_pyside_module(QtWebChannel + QtWebChannel_include_dirs + QtWebChannel_libraries + QtWebChannel_deps + QtWebChannel_typesystem_path + QtWebChannel_SRC + "") diff --git a/sources/pyside2/PySide2/QtWebChannel/typesystem_webchannel.xml b/sources/pyside2/PySide2/QtWebChannel/typesystem_webchannel.xml new file mode 100644 index 000000000..c25d3f30a --- /dev/null +++ b/sources/pyside2/PySide2/QtWebChannel/typesystem_webchannel.xml @@ -0,0 +1,55 @@ +<?xml version="1.0"?> +<!-- +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of PySide2. +** +** $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.QtWebChannel"> + <load-typesystem name="typesystem_core.xml" generate="no"/> + + <object-type name="QWebChannel" /> + <object-type name="QWebChannelAbstractTransport"> + <extra-includes> + <include file-name="QJsonObject" location="global"/> + </extra-includes> + </object-type> + <!-- Not sure if this will be useful, but commented out for now because + the QML module is not yet wrapped. + <object-type name="QQmlWebChannel" /> --> + +</typesystem> |