From 3a5b455a8ae6cf6f911078d66deaed64dce33af8 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 7 Jun 2018 15:54:49 +0200 Subject: Add bindings for QtWebEngine (aka Quick) There is only one method we really need, QtWebEngine::initialize() which is used for all Qt Quick based WebEngine applications. Otherwise you get a warning upon startup of a Qt Quick WebEngine application, and this might lead to undefined behavior. Task-number: PYSIDE-688 Change-Id: I7de2bbb58c49cb2a41b0e13ffc9de6a3161f3960 Reviewed-by: Christian Tismer --- sources/pyside2/CMakeLists.txt | 2 +- sources/pyside2/PySide2/QtWebEngine/CMakeLists.txt | 32 +++++++++++++++ .../PySide2/QtWebEngine/typesystem_webengine.xml | 45 +++++++++++++++++++++ sources/pyside2/tests/QtWebEngine/CMakeLists.txt | 30 +++++++++++++- .../tests/QtWebEngine/web_engine_initialize.py | 46 ++++++++++++++++++++++ 5 files changed, 153 insertions(+), 2 deletions(-) create mode 100644 sources/pyside2/PySide2/QtWebEngine/CMakeLists.txt create mode 100644 sources/pyside2/PySide2/QtWebEngine/typesystem_webengine.xml create mode 100644 sources/pyside2/tests/QtWebEngine/web_engine_initialize.py (limited to 'sources/pyside2') diff --git a/sources/pyside2/CMakeLists.txt b/sources/pyside2/CMakeLists.txt index d5cf26612..1958c79a2 100644 --- a/sources/pyside2/CMakeLists.txt +++ b/sources/pyside2/CMakeLists.txt @@ -395,7 +395,7 @@ endif() # Disabling WebKit by default # If WebKit support is needed add the following elements # to the list: WebKit WebKitWidgets -list(APPEND ALL_OPTIONAL_MODULES WebChannel WebEngineCore WebEngineWidgets WebSockets) +list(APPEND ALL_OPTIONAL_MODULES WebChannel WebEngineCore WebEngine WebEngineWidgets WebSockets) if (Qt5Core_VERSION VERSION_GREATER 5.9.3) # Depending on fixes in Qt3D list(APPEND ALL_OPTIONAL_MODULES 3DCore 3DRender 3DInput 3DLogic 3DAnimation 3DExtras) endif() diff --git a/sources/pyside2/PySide2/QtWebEngine/CMakeLists.txt b/sources/pyside2/PySide2/QtWebEngine/CMakeLists.txt new file mode 100644 index 000000000..9029509ee --- /dev/null +++ b/sources/pyside2/PySide2/QtWebEngine/CMakeLists.txt @@ -0,0 +1,32 @@ +project(QtWebEngine) + +set(QtWebEngine_SRC +${QtWebEngine_GEN_DIR}/qtwebengine_wrapper.cpp +# module is always needed +${QtWebEngine_GEN_DIR}/qtwebengine_module_wrapper.cpp +) + +set(QtWebEngine_include_dirs + ${QtWebEngine_SOURCE_DIR} + ${QtWebEngine_BINARY_DIR} + ${Qt5Core_INCLUDE_DIRS} + ${SHIBOKEN_INCLUDE_DIR} + ${libpyside_SOURCE_DIR} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} + ${QtCore_GEN_DIR} + ) +set(QtWebEngine_libraries pyside2 + ${SHIBOKEN_PYTHON_LIBRARIES} + ${SHIBOKEN_LIBRARY} + ${Qt5WebEngine_LIBRARIES} + ${Qt5Core_LIBRARIES} + ) +set(QtWebEngine_deps QtCore) +create_pyside_module(QtWebEngine + QtWebEngine_include_dirs + QtWebEngine_libraries + QtWebEngine_deps + QtWebEngine_SOURCE_DIR + QtWebEngine_SRC + "") + diff --git a/sources/pyside2/PySide2/QtWebEngine/typesystem_webengine.xml b/sources/pyside2/PySide2/QtWebEngine/typesystem_webengine.xml new file mode 100644 index 000000000..9b38bc1e6 --- /dev/null +++ b/sources/pyside2/PySide2/QtWebEngine/typesystem_webengine.xml @@ -0,0 +1,45 @@ + + + + + + diff --git a/sources/pyside2/tests/QtWebEngine/CMakeLists.txt b/sources/pyside2/tests/QtWebEngine/CMakeLists.txt index 2f7cb08b9..0e85a698e 100644 --- a/sources/pyside2/tests/QtWebEngine/CMakeLists.txt +++ b/sources/pyside2/tests/QtWebEngine/CMakeLists.txt @@ -1 +1,29 @@ -# Please add some tests, here +############################################################################# +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the test suite of Qt for Python. +## +## $QT_BEGIN_LICENSE:GPL-EXCEPT$ +## 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 General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 as published by the Free Software +## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +## 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-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +PYSIDE_TEST(web_engine_initialize.py) diff --git a/sources/pyside2/tests/QtWebEngine/web_engine_initialize.py b/sources/pyside2/tests/QtWebEngine/web_engine_initialize.py new file mode 100644 index 000000000..f6abeb9cd --- /dev/null +++ b/sources/pyside2/tests/QtWebEngine/web_engine_initialize.py @@ -0,0 +1,46 @@ +############################################################################# +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the test suite of Qt for Python. +## +## $QT_BEGIN_LICENSE:GPL-EXCEPT$ +## 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 General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 as published by the Free Software +## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +## 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-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +from __future__ import print_function + +import unittest + +from PySide2.QtCore import QTimer +from PySide2.QtWebEngine import QtWebEngine +from PySide2.QtWidgets import QApplication + + +class MainTest(unittest.TestCase): + def test_initializePresent(self): + app = QApplication([]) + QtWebEngine.initialize() + QTimer.singleShot(2000, app.quit) + app.exec_() + +if __name__ == '__main__': + unittest.main() -- cgit v1.2.3