Merge branch '5.9' into 5.11

Change-Id: I7e55b4f27f77e2333b9e0f4cddc8de4b89b6043b

7 files changed, 156 insertions, 5 deletions

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()