diff options
-rw-r--r-- | build_scripts/main.py | 3 | ||||
-rw-r--r-- | coin_build_instructions.py | 4 | ||||
-rw-r--r-- | coin_test_instructions.py | 8 | ||||
-rw-r--r-- | examples/webenginequick/browser.qml | 53 | ||||
-rw-r--r-- | examples/webenginequick/quicknanobrowser.py | 59 | ||||
-rw-r--r-- | setup.py | 8 | ||||
-rw-r--r-- | sources/pyside2/CMakeLists.txt | 2 | ||||
-rw-r--r-- | sources/pyside2/PySide2/QtWebEngine/CMakeLists.txt | 32 | ||||
-rw-r--r-- | sources/pyside2/PySide2/QtWebEngine/typesystem_webengine.xml | 45 | ||||
-rw-r--r-- | sources/pyside2/PySide2/__init__.py.in | 4 | ||||
-rw-r--r-- | sources/pyside2/doc/codesnippets/examples/imageprovider/imageprovider.cpp | 2 | ||||
-rw-r--r-- | sources/pyside2/tests/QtWebEngine/CMakeLists.txt | 30 | ||||
-rw-r--r-- | sources/pyside2/tests/QtWebEngine/web_engine_initialize.py | 46 |
13 files changed, 283 insertions, 13 deletions
diff --git a/build_scripts/main.py b/build_scripts/main.py index dca373401..b424aa8e4 100644 --- a/build_scripts/main.py +++ b/build_scripts/main.py @@ -1160,7 +1160,8 @@ class PysideBuild(_build): return config def is_webengine_built(self, built_modules): - return 'WebEngineWidgets' in built_modules or 'WebEngineCore' in built_modules + return ('WebEngineWidgets' in built_modules or 'WebEngineCore' in built_modules + or 'WebEngine' in built_modules) def prepare_standalone_clang(self, is_win = False): """ diff --git a/coin_build_instructions.py b/coin_build_instructions.py index 82841a320..65e198be4 100644 --- a/coin_build_instructions.py +++ b/coin_build_instructions.py @@ -126,7 +126,9 @@ def run_build_instructions(): exit() # Uses default python, hopefully we have python2 installed on all hosts - call_setup("") + # Skip building using Python 2 on Windows, because of different MSVC C runtimes (VS2008 vs VS2015+) + if CI_HOST_OS != "Windows": + call_setup("") # In case of packaging build, we have to build also python3 wheel if CI_RELEASE_CONF and CI_HOST_OS_VER not in ["RHEL_6_6"]: diff --git a/coin_test_instructions.py b/coin_test_instructions.py index e90316784..bd65b5b7e 100644 --- a/coin_test_instructions.py +++ b/coin_test_instructions.py @@ -77,10 +77,14 @@ def run_test_instructions(): exit() os.chdir(CI_ENV_AGENT_DIR) - call_testrunner("", "0") + testRun = 0 + # We didn't build for Python 2 in win + if CI_HOST_OS != "Windows": + call_testrunner("", str(testRun)) + testRun =+ 1 # We know that second build was with python3 if CI_RELEASE_CONF and CI_HOST_OS_VER not in ["RHEL_6_6"]: - call_testrunner("3", "1") + call_testrunner("3", str(testRun)) if __name__ == "__main__": run_test_instructions() diff --git a/examples/webenginequick/browser.qml b/examples/webenginequick/browser.qml new file mode 100644 index 000000000..781453863 --- /dev/null +++ b/examples/webenginequick/browser.qml @@ -0,0 +1,53 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt for Python examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.Window 2.0 +import QtWebEngine 1.0 + +Window { + width: 1024 + height: 768 + visible: true + WebEngineView { + anchors.fill: parent + url: "https://www.qt.io" + } +} diff --git a/examples/webenginequick/quicknanobrowser.py b/examples/webenginequick/quicknanobrowser.py new file mode 100644 index 000000000..24e58eada --- /dev/null +++ b/examples/webenginequick/quicknanobrowser.py @@ -0,0 +1,59 @@ +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the Qt for Python examples of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:BSD$ +## You may use this file under the terms of the BSD license as follows: +## +## "Redistribution and use in source and binary forms, with or without +## modification, are permitted provided that the following conditions are +## met: +## * Redistributions of source code must retain the above copyright +## notice, this list of conditions and the following disclaimer. +## * Redistributions in binary form must reproduce the above copyright +## notice, this list of conditions and the following disclaimer in +## the documentation and/or other materials provided with the +## distribution. +## * Neither the name of The Qt Company Ltd nor the names of its +## contributors may be used to endorse or promote products derived +## from this software without specific prior written permission. +## +## +## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +## "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +## LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +## A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +## OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +## DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +## +## $QT_END_LICENSE$ +## +############################################################################# + +"""PySide2 WebEngine QtQuick 2 Example""" + +import os +from PySide2.QtCore import QUrl +from PySide2.QtQml import QQmlApplicationEngine +from PySide2.QtWidgets import QApplication +from PySide2.QtWebEngine import QtWebEngine + +def main(): + app = QApplication([]) + QtWebEngine.initialize() + engine = QQmlApplicationEngine() + qml_file_path = os.path.join(os.path.dirname(__file__), 'browser.qml') + qml_url = QUrl.fromLocalFile(os.path.abspath(qml_file_path)) + engine.load(qml_url) + app.exec_() + +if __name__ == '__main__': + main() @@ -267,10 +267,10 @@ setup( 'Topic :: Software Development :: Widget Sets', ], keywords = 'Qt', - author = 'PySide2 Team', - author_email = 'contact@pyside.org', - url = 'http://www.pyside.org', - download_url = 'https://download.qt-project.org/official_releases/pyside2/', + author = 'Qt for Python Team', + author_email = 'pyside@qt-project.org', + url = 'https://www.pyside.org', + download_url = 'https://download.qt.io/official_releases/QtForPython/', license = 'LGPL', packages = ['PySide2', 'pyside2uic', 'pyside2uic.Compiler', 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 @@ +<?xml version="1.0"?> +<!-- +/**************************************************************************** +** +** Copyright (C) 2018 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.QtWebEngine"> + <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> + <namespace-type name="QtWebEngine"/> +</typesystem> diff --git a/sources/pyside2/PySide2/__init__.py.in b/sources/pyside2/PySide2/__init__.py.in index f33b05e31..19425c347 100644 --- a/sources/pyside2/PySide2/__init__.py.in +++ b/sources/pyside2/PySide2/__init__.py.in @@ -24,7 +24,7 @@ def _setupQtDirectories(): # PATH has to contain the package directory, otherwise plugins # won't be able to find their required Qt libraries (e.g. the # svg image plugin won't find Qt5Svg.dll). - os.environ['PATH'] = pyside_package_dir + ";" + os.environ['PATH'] + os.environ['PATH'] = pyside_package_dir + os.pathsep + os.environ['PATH'] # On Windows add the PySide2\openssl folder (if it exists) to # the PATH so that the SSL DLLs can be found when Qt tries to @@ -34,7 +34,7 @@ def _setupQtDirectories(): if os.path.exists(openssl_dir): path = os.environ['PATH'] try: - os.environ['PATH'] = os.path.join(openssl_dir, path) + os.environ['PATH'] = openssl_dir + os.pathsep + path try: from . import QtNetwork except ImportError: diff --git a/sources/pyside2/doc/codesnippets/examples/imageprovider/imageprovider.cpp b/sources/pyside2/doc/codesnippets/examples/imageprovider/imageprovider.cpp index 1bff57293..b3890114b 100644 --- a/sources/pyside2/doc/codesnippets/examples/imageprovider/imageprovider.cpp +++ b/sources/pyside2/doc/codesnippets/examples/imageprovider/imageprovider.cpp @@ -51,7 +51,7 @@ //![0] class ColorImageProvider (QQuickImageProvider): def __init__(self): - QQuickImageProvider.__init__(self, QDeclarativeImageProvider.Pixmap) + QQuickImageProvider.__init__(self, QQuickImageProvider.Pixmap) def requestPixmap(id, size, requestedSize): width = 100 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() |