diff options
31 files changed, 0 insertions, 1777 deletions
diff --git a/build_scripts/platforms/macos.py b/build_scripts/platforms/macos.py index 7932db337..614d6acbc 100644 --- a/build_scripts/platforms/macos.py +++ b/build_scripts/platforms/macos.py @@ -140,8 +140,6 @@ def prepare_standalone_package_macos(self, vars): ignored_modules = [] if not self.is_webengine_built(built_modules): ignored_modules.extend(['libQt5WebEngine*.dylib']) - if 'WebKit' not in built_modules: - ignored_modules.extend(['libQt5WebKit*.dylib']) accepted_modules = ['libQt5*.5.dylib'] if constrain_modules: accepted_modules = ["libQt5" + module + "*.5.dylib" for module in constrain_modules] diff --git a/sources/cmake_helpers/helpers.cmake b/sources/cmake_helpers/helpers.cmake index ae35e1116..86b0c4f62 100644 --- a/sources/cmake_helpers/helpers.cmake +++ b/sources/cmake_helpers/helpers.cmake @@ -53,9 +53,6 @@ endif() if(WIN32) list(APPEND ALL_OPTIONAL_MODULES AxContainer) 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 WebEngine WebEngineWidgets WebSockets) if (Qt${QT_MAJOR_VERSION}Core_VERSION VERSION_GREATER 5.9.3) # Depending on fixes in Qt3D list(APPEND ALL_OPTIONAL_MODULES 3DCore 3DRender 3DInput 3DLogic 3DAnimation 3DExtras) diff --git a/sources/pyside2/PySide2/CMakeLists.txt b/sources/pyside2/PySide2/CMakeLists.txt index 120bc8e52..0ded09f5d 100644 --- a/sources/pyside2/PySide2/CMakeLists.txt +++ b/sources/pyside2/PySide2/CMakeLists.txt @@ -100,8 +100,6 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/templates/opengl_common.xml DESTINATION share/PySide2${pyside_SUFFIX}/typesystems) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/templates/openglfunctions_common.xml DESTINATION share/PySide2${pyside_SUFFIX}/typesystems) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/templates/webkitwidgets_common.xml - DESTINATION share/PySide2${pyside_SUFFIX}/typesystems) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/templates/xml_common.xml DESTINATION share/PySide2${pyside_SUFFIX}/typesystems) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pyside2_global.h diff --git a/sources/pyside2/PySide2/QtWebKit/CMakeLists.txt b/sources/pyside2/PySide2/QtWebKit/CMakeLists.txt deleted file mode 100644 index 4220e46bf..000000000 --- a/sources/pyside2/PySide2/QtWebKit/CMakeLists.txt +++ /dev/null @@ -1,34 +0,0 @@ -project(QtWebKit) - -set(QtWebKit_SRC -${QtWebKit_GEN_DIR}/webcore_wrapper.cpp -# module is always needed -${QtWebKit_GEN_DIR}/qtwebkit_module_wrapper.cpp -) - -set(QtWebKit_include_dirs ${QtWebKit_SOURCE_DIR} - ${QtWebKit_BINARY_DIR} - ${Qt${QT_MAJOR_VERSION}Core_INCLUDE_DIRS} - ${Qt${QT_MAJOR_VERSION}Gui_INCLUDE_DIRS} - ${Qt${QT_MAJOR_VERSION}Network_INCLUDE_DIRS} - ${Qt${QT_MAJOR_VERSION}WebKit_INCLUDE_DIRS} - ${libpyside_SOURCE_DIR} - ${QtCore_GEN_DIR} - ${QtGui_GEN_DIR} - ${QtWidgets_GEN_DIR} - ${QtNetwork_GEN_DIR} - ) -set(QtWebKit_libraries pyside2 - ${Qt${QT_MAJOR_VERSION}WebKit_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Network_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES} - ) -set(QtWebKit_deps QtGui QtNetwork) -create_pyside_module(NAME QtWebKit - INCLUDE_DIRS QtWebKit_include_dirs - LIBRARIES QtWebKit_libraries - DEPS QtWebKit_deps - TYPESYSTEM_PATH QtWebKit_SOURCE_DIR - SOURCES QtWebKit_SRC) - diff --git a/sources/pyside2/PySide2/QtWebKit/typesystem_webkit.xml b/sources/pyside2/PySide2/QtWebKit/typesystem_webkit.xml deleted file mode 100644 index e92417f26..000000000 --- a/sources/pyside2/PySide2/QtWebKit/typesystem_webkit.xml +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/**************************************************************************** -** -** Copyright (C) 2016 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.QtWebKit"> - <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> - <load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/> - <load-typesystem name="QtNetwork/typesystem_network.xml" generate="no"/> - - <namespace-type name="WebCore"/> - -</typesystem> diff --git a/sources/pyside2/PySide2/QtWebKitWidgets/CMakeLists.txt b/sources/pyside2/PySide2/QtWebKitWidgets/CMakeLists.txt deleted file mode 100644 index 0bf660a62..000000000 --- a/sources/pyside2/PySide2/QtWebKitWidgets/CMakeLists.txt +++ /dev/null @@ -1,65 +0,0 @@ -project(QtWebKitWidgets) - -set(QtWebKitWidgets_SRC -${QtWebKitWidgets_GEN_DIR}/qgraphicswebview_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebdatabase_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebelement_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebelementcollection_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebframe_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebhistory_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebhistoryinterface_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebhistoryitem_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebhittestresult_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebinspector_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebpage_choosemultiplefilesextensionoption_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebpage_choosemultiplefilesextensionreturn_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebpage_errorpageextensionoption_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebpage_errorpageextensionreturn_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebpage_extensionoption_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebpage_extensionreturn_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebpage_viewportattributes_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebpage_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebpluginfactory_mimetype_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebpluginfactory_plugin_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebpluginfactory_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebsecurityorigin_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebsettings_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebview_wrapper.cpp -# module is always needed -${QtWebKitWidgets_GEN_DIR}/qtwebkitwidgets_module_wrapper.cpp -) - -set(QtWebKitWidgets_include_dirs - ${QtWebKitWidgets_SOURCE_DIR} - ${QtWebKitWidgets_BINARY_DIR} - ${Qt${QT_MAJOR_VERSION}Core_INCLUDE_DIRS} - ${Qt${QT_MAJOR_VERSION}Gui_INCLUDE_DIRS} - ${Qt${QT_MAJOR_VERSION}Widgets_INCLUDE_DIRS} - ${Qt${QT_MAJOR_VERSION}WebKit_INCLUDE_DIRS} - ${Qt${QT_MAJOR_VERSION}PrintSupport_INCLUDE_DIRS} - ${Qt${QT_MAJOR_VERSION}Network_INCLUDE_DIRS} - ${Qt${QT_MAJOR_VERSION}WebKitWidgets_INCLUDE_DIRS} - ${libpyside_SOURCE_DIR} - ${QtCore_GEN_DIR} - ${QtGui_GEN_DIR} - ${QtWidgets_GEN_DIR} - ${QtPrintSupport_GEN_DIR} - ${QtWebKit_GEN_DIR} - ${QtNetwork_GEN_DIR} - ) -set(QtWebKitWidgets_libraries pyside2 - ${Qt${QT_MAJOR_VERSION}WebKit_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}WebKitWidgets_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Network_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Widgets_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES} - ) -set(QtWebKitWidgets_deps QtWidgets QtPrintSupport QtNetwork) -create_pyside_module(NAME QtWebKitWidgets - INCLUDE_DIRS QtWebKitWidgets_include_dirs - LIBRARIES QtWebKitWidgets_libraries - DEPS QtWebKitWidgets_deps - TYPESYSTEM_PATH QtWebKitWidgets_SOURCE_DIR - SOURCES QtWebKitWidgets_SRC) - diff --git a/sources/pyside2/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml b/sources/pyside2/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml deleted file mode 100644 index 7760c1c3d..000000000 --- a/sources/pyside2/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml +++ /dev/null @@ -1,211 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/**************************************************************************** -** -** Copyright (C) 2016 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.QtWebKitWidgets"> - <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> - <load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/> - <load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no"/> - <load-typesystem name="QtWebKit/typesystem_webkit.xml" generate="no"/> - <load-typesystem name="QtNetwork/typesystem_network.xml" generate="no"/> - <load-typesystem name="QtPrintSupport/typesystem_printsupport.xml" generate="no"/> - <load-typesystem name="templates/webkitwidgets_common.xml" generate="no"/> - - <value-type name="QWebDatabase"/> - - <object-type name="QWebPluginFactory"> - <enum-type name="Extension"/> - <value-type name="Plugin"/> - <value-type name="MimeType"/> - <modify-function signature="create(const QString &,const QUrl &,const QStringList &,const QStringList &)const"> - <modify-argument index="return"> - <define-ownership class="native" owner="c++"/> - <define-ownership class="target" owner="target"/> - </modify-argument> - </modify-function> - </object-type> - - <object-type name="QWebHistory"/> - <object-type name="QWebHistoryInterface"/> - <value-type name="QWebHistoryItem"/> - - <value-type name="QWebSecurityOrigin"> - <enum-type name="SubdomainSetting"/> - </value-type> - - <object-type name="QWebSettings"> - <enum-type name="FontFamily"/> - <enum-type name="FontSize"/> - <enum-type name="ThirdPartyCookiePolicy"/> - <enum-type name="WebAttribute"/> - <enum-type name="WebGraphic"/> - </object-type> - - <object-type name="QWebView"> - <modify-function signature="setPage(QWebPage*)"> - <modify-argument index="1"> - <reference-count action="set"/> - </modify-argument> - </modify-function> - <modify-function signature="page()const"> - <modify-argument index="return"> - <define-ownership class="target" owner="default"/> - </modify-argument> - <inject-code position="end" file="../glue/qtwebkitwidgets.cpp" snippet="qwebview-page"/> - </modify-function> - <modify-function signature="print(QPrinter*)const" rename="print_"/> - </object-type> - - <value-type name="QWebElement" since="4.6"> - <enum-type name="StyleResolveStrategy"/> - </value-type> - - <value-type name="QWebElementCollection" since="4.6"> - <add-function signature="__len__"> - <inject-code file="../glue/qtwebkitwidgets.cpp" snippet="qwebelementcollection-len"/> - </add-function> - <add-function signature="__getitem__"> - <inject-code file="../glue/qtwebkitwidgets.cpp" snippet="qwebelementcollection-getitem"/> - </add-function> - </value-type> - - <object-type name="QWebFrame"> - <enum-type name="RenderLayer" flags="RenderLayers" since="4.6"/> - <enum-type name="ValueOwnership"/> - <modify-function signature="addToJavaScriptWindowObject(QString,QObject*,QWebFrame::ValueOwnership)"> - <modify-argument index="2"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="print(QPrinter*)const" rename="print_"/> - <modify-function signature="metaData()const"> - <modify-argument index="return"> - <replace-type modified-type="PyObject"/> - </modify-argument> - <inject-code position="end" file="../glue/qtwebkitwidgets.cpp" snippet="qwebframe-metadata" /> - </modify-function> - </object-type> - - <object-type name="QWebPage"> - <enum-type name="ErrorDomain"/> - <enum-type name="Extension"/> - <enum-type name="Feature"/> - <enum-type name="FindFlag" flags="FindFlags"/> - <enum-type name="LinkDelegationPolicy"/> - <enum-type name="NavigationType"/> - <enum-type name="PermissionPolicy" since="4.8" revision="4800"/> - <enum-type name="VisibilityState"/> - <enum-type name="WebAction"/> - <enum-type name="WebWindowType"/> - - <value-type name="ChooseMultipleFilesExtensionOption"/> - <value-type name="ChooseMultipleFilesExtensionReturn"/> - <value-type name="ErrorPageExtensionOption" since="4.6"/> - <value-type name="ErrorPageExtensionReturn" since="4.6"/> - <value-type name="ExtensionOption"/> - <value-type name="ExtensionReturn"/> - <value-type name="ViewportAttributes"/> - - <modify-function signature="extension(QWebPage::Extension,const QWebPage::ExtensionOption*,QWebPage::ExtensionReturn*)"> - <modify-argument index="2" invalidate-after-use="yes"> - <conversion-rule class="target"> - <insert-template name="qwebpage_extension_argument_conversion"> - <replace from="$TYPE_SUFFIX" to="Option"/> - </insert-template> - </conversion-rule> - </modify-argument> - <modify-argument index="3" invalidate-after-use="yes"> - <conversion-rule class="target"> - <insert-template name="qwebpage_extension_argument_conversion"> - <replace from="$TYPE_SUFFIX" to="Return"/> - </insert-template> - </conversion-rule> - </modify-argument> - </modify-function> - - <modify-function signature="setNetworkAccessManager(QNetworkAccessManager*)"> - <modify-argument index="1"> - <reference-count action="set"/> - </modify-argument> - </modify-function> - <modify-function signature="networkAccessManager()const"> - <modify-argument index="return"> - <reference-count action="set" variable-name="setNetworkAccessManager(QNetworkAccessManager*)1"/> - </modify-argument> - </modify-function> - <modify-function signature="view()const"> - <modify-argument index="return"> - <define-ownership owner="default"/> - </modify-argument> - </modify-function> - <modify-function signature="pluginFactory()const"> - <modify-argument index="return"> - <define-ownership owner="default"/> - </modify-argument> - </modify-function> - - <modify-function signature="javaScriptPrompt(QWebFrame*,const QString &,const QString &,QString*)"> - <modify-argument index="4"> - <remove-argument /> - <conversion-rule class="native"> - <insert-template name="qstring_remove"/> - </conversion-rule> - </modify-argument> - <modify-argument index="return"> - <replace-type modified-type="PySequence"/> - <conversion-rule class="native"> - <insert-template name="pysequence_qstring"/> - </conversion-rule> - <conversion-rule class="target"> - <insert-template name="qstring_pytuple"/> - </conversion-rule> - </modify-argument> - </modify-function> - - <add-function signature="qt_metacall()"> - <inject-code class="native" file="../glue/qtwebkitwidgets.cpp" snippet="qwebpage-qt-metacall"/> - </add-function> - </object-type> - - <value-type name="QWebHitTestResult"/> - - <object-type name="QGraphicsWebView" since="4.6"/> - <object-type name="QWebInspector" since="4.6"/> -</typesystem> diff --git a/sources/pyside2/doc/codesnippets/webkitsnippets/qtwebkit_qwebinspector_snippet.cpp b/sources/pyside2/doc/codesnippets/webkitsnippets/qtwebkit_qwebinspector_snippet.cpp deleted file mode 100644 index 79dc15177..000000000 --- a/sources/pyside2/doc/codesnippets/webkitsnippets/qtwebkit_qwebinspector_snippet.cpp +++ /dev/null @@ -1,60 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of Qt for Python. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, 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$ -** -****************************************************************************/ - -def wrapInFunction(): -//! [0] - # ... - page = QWebPage() - # ... - - inspector = QWebInspector() - inspector.setPage(page) -//! [0] - diff --git a/sources/pyside2/doc/codesnippets/webkitsnippets/qtwebkit_qwebview_snippet.cpp b/sources/pyside2/doc/codesnippets/webkitsnippets/qtwebkit_qwebview_snippet.cpp deleted file mode 100644 index 268f4344e..000000000 --- a/sources/pyside2/doc/codesnippets/webkitsnippets/qtwebkit_qwebview_snippet.cpp +++ /dev/null @@ -1,80 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of Qt for Python. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, 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$ -** -****************************************************************************/ - -def wrapInFunction(): -//! [0] - view.page().history() -//! [0] - - -//! [1] - view.page().settings() -//! [1] - - -//! [2] - view.triggerAction(QWebPage.Copy) -//! [2] - - -//! [3] - view.page().triggerPageAction(QWebPage.Stop) -//! [3] - - -//! [4] - view.page().triggerPageAction(QWebPage.GoBack) -//! [4] - - -//! [5] - view.page().triggerPageAction(QWebPage.GoForward) -//! [5] - diff --git a/sources/pyside2/doc/codesnippets/webkitsnippets/simple/main.cpp b/sources/pyside2/doc/codesnippets/webkitsnippets/simple/main.cpp deleted file mode 100644 index 1382cd446..000000000 --- a/sources/pyside2/doc/codesnippets/webkitsnippets/simple/main.cpp +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of Qt for Python. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, 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$ -** -****************************************************************************/ - -from PySide2.QtCore import * -from PySide2.QtGui import * -from PySide2.QtWebKit import * -import sys - -app = QApplication(sys.argv) -parent = None -//! [Using QWebView] -view = QWebView(parent) -view.load(QUrl("http://qt-project.org/")) -view.show() -//! [Using QWebView] -sys.exit(app.exec_()) diff --git a/sources/pyside2/doc/codesnippets/webkitsnippets/webelement/main.cpp b/sources/pyside2/doc/codesnippets/webkitsnippets/webelement/main.cpp deleted file mode 100644 index 67e101ae0..000000000 --- a/sources/pyside2/doc/codesnippets/webkitsnippets/webelement/main.cpp +++ /dev/null @@ -1,114 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of Qt for Python. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, 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$ -** -****************************************************************************/ - -def traverse(): -//! [Traversing with QWebElement] - frame.setHtml("<html><body><p>First Paragraph</p><p>Second Paragraph</p></body></html>") - doc = frame.documentElement() - body = doc.firstChild() - firstParagraph = body.firstChild() - secondParagraph = firstParagraph.nextSibling() -//! [Traversing with QWebElement] - -def findButtonAndClick(): - frame.setHtml("<form name=\"myform\" action=\"submit_form.asp\" method=\"get\">" \ - "<input type=\"text\" name=\"myfield\">" \ - "<input type=\"submit\" value=\"Submit\">" \ - "</form>") - -//! [Calling a DOM element method] - - document = frame.documentElement() - # Assume that the document has the following structure: - # - # <form name="myform" action="submit_form.asp" method="get"> - # <input type="text" name="myfield"> - # <input type="submit" value="Submit"> - # </form> - - button = document.findFirst("input[type=submit]") - button.evaluateJavaScript("click()") - -//! [Calling a DOM element method] - -def autocomplete1(): - document = frame.documentElement() -//! [autocomplete1] - firstTextInput = document.findFirst("input[type=text]") - storedText = firstTextInput.attribute("value") -//! [autocomplete1] - -def autocomplete2(): - document = frame.documentElement() - storedText = "text" - -//! [autocomplete2] - firstTextInput = document.findFirst("input[type=text]") - textInput.setAttribute("value", storedText) -//! [autocomplete2] - -def findAll(): -//! [FindAll] - document = frame.documentElement() - # Assume the document has the following structure: - # - # <p class=intro> - # <span>Intro</span> - # <span>Snippets</span> - # </p> - # <p> - # <span>Content</span> - # <span>Here</span> - # </p> - -//! [FindAll intro] - allSpans = document.findAll("span") - introSpans = document.findAll("p.intro span") -//! [FindAll intro] //! [FindAll] diff --git a/sources/pyside2/doc/codesnippets/webkitsnippets/webpage/main.cpp b/sources/pyside2/doc/codesnippets/webkitsnippets/webpage/main.cpp deleted file mode 100644 index b64a4f35b..000000000 --- a/sources/pyside2/doc/codesnippets/webkitsnippets/webpage/main.cpp +++ /dev/null @@ -1,83 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of Qt for Python. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, 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$ -** -****************************************************************************/ - -//! [0] -class Thumbnailer (QObject): - def __init__(self, url): -//! [1] - QObject.__init__(self) - self.page = QWebPage() - self.page.mainFrame().load(url) - page.loadFinished[bool].connect(self.render) -//! [1] - - finished = Signal() - -//! [2] - def render(self): - self.page.setViewportSize(self.page.mainFrame().contentsSize()) - image = QImage(self.page.viewportSize(), QImage.Format_ARGB32) - painter = QPainter(image) - - self.page.mainFrame().render(painter) - painter.end() - - thumbnail = image.scaled(400, 400) - thumbnail.save("thumbnail.png") - - self.finished.emit() -//! [2] -//! [0] - -app = QApplication(sys.argv) - -thumbnail = Thumbnailer(QUrl("http://qt-project.org")) -thumbnail.finished.connect(app.quit) -sys.exit(app.exec_()) diff --git a/sources/pyside2/doc/extras/QtWebKit.rst b/sources/pyside2/doc/extras/QtWebKit.rst deleted file mode 100644 index 58f9230a7..000000000 --- a/sources/pyside2/doc/extras/QtWebKit.rst +++ /dev/null @@ -1,94 +0,0 @@ -QtWebKit provides a Web browser engine that makes it easy to embed content from the World Wide Web into your Qt application. At the same time Web content can be enhanced with native controls. - -QtWebKit provides facilities for rendering of HyperText Markup Language (HTML), Extensible HyperText Markup Language (XHTML) and Scalable Vector Graphics (SVG) documents, styled using Cascading Style Sheets (CSS) and scripted with JavaScript. - -A bridge between the JavaScript execution environment and the Qt object model makes it possible for custom QObjects to be scripted. Integration with the Qt networking module enables Web pages to be transparently loaded from Web servers, the local file system or even the Qt resource system. - -In addition to providing pure rendering features, HTML documents can be made fully editable to the user through the use of the contenteditable attribute on HTML elements. - -QtWebKit is based on the Open Source WebKit engine. More information about WebKit itself can be found on the _`WebKit Open Source Project <http://webkit.org/>` Web site. - -Including In Your Project -------------------------- - -To include the definitions of the module's classes, use the following directive: - -:: - - import PySide2.QtWebKit - - -.. note:: Web site icons, also known as "FavIcons", are currently not supported on Windows. We plan to address this in a future release. - -Architecture ------------- - -The easiest way to render content is through the QWebView class. As a widget it can be embedded into your forms or a graphics view, and it provides convenience functions for downloading and rendering web sites. - -:: - - view = QWebView(parent) - view.load(QUrl("http://qt.nokia.com/")) - view.show() - -QWebView is used to view Web pages. An instance of QWebView has one QWebPage. QWebPage provides access to the document structure in a page, describing features such as frames, the navigation history, and the undo/redo stack for editable content. - -HTML documents can be nested using frames in a frameset. An individual frame in HTML is represented using the QWebFrame class. This class includes the bridge to the JavaScript window object and can be painted using QPainter. Each QWebPage has one QWebFrame object as its main frame, and the main frame may contain many child frames. - -Individual elements of an HTML document can be accessed via DOM JavaScript interfaces from within a web page. The equivalent of this API in QtWebKit is represented by QWebElement. QWebElement objects are obtained using QWebFrame's findAllElements() and findFirstElement() functions with CSS selector queries. - -Common web browser features, defaults and other settings can be configured through the QWebSettings class. It is possible to provide defaults for all QWebPage instances through the default settings. Individual attributes can be overidden by the page specific settings object. - -Netscape Plugin Support ------------------------ - -.. note:: Netscape plugin support is only available on desktop platforms. - -Since WebKit supports the Netscape Plugin API, Qt applications can display Web pages that embed common plugins on platforms for which those plugins are available. To enable plugin support, the user must have the appropriate binary files for those plugins installed and the ``QWebSettings.PluginsEnabled`` attribute must be enabled for the application. - -The following locations are searched for plugins: - -* Linux/Unix (X11) - * .mozilla/plugins in the user's home directory - * .netscape/plugins in the user's home directory - * System locations, such as - * /usr/lib/browser/plugins - * /usr/local/lib/mozilla/plugins - * /usr/lib/firefox/plugins - * /usr/lib64/browser-plugins - * /usr/lib/browser-plugins - * /usr/lib/mozilla/plugins - * /usr/local/netscape/plugins - * /opt/mozilla/plugins - * /opt/mozilla/lib/plugins - * /opt/netscape/plugins - * /opt/netscape/communicator/plugins - * /usr/lib/netscape/plugins - * /usr/lib/netscape/plugins-libc5 - * /usr/lib/netscape/plugins-libc6 - * /usr/lib64/netscape/plugins - * /usr/lib64/mozilla/plugins - * Locations specified by environment variables: - * $MOZILLA_HOME/plugins - * $MOZ_PLUGIN_PATH - * $QTWEBKIT_PLUGIN_PATH -* Windows - * The user's Application Data\Mozilla\plugins directory - * Standard system locations of plugins for Quicktime, Flash, etc. -* Mac OS X - * Library/Internet Plug-Ins in the user's home directory - * The system /Library/Internet Plug-Ins directory - -License Information -------------------- - -Qt Commercial Edition licensees that wish to distribute applications that use the QtWebKit module need to be aware of their obligations under the GNU Library General Public License (LGPL). - -Developers using the Open Source Edition can choose to redistribute the module under the appropriate version of the GNU LGPL. -WebKit is licensed under the GNU Library General Public License. Individual contributor names and copyright dates can be found inline in the code. - -This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. - -You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
\ No newline at end of file diff --git a/sources/pyside2/tests/QtWebKit/CMakeLists.txt b/sources/pyside2/tests/QtWebKit/CMakeLists.txt deleted file mode 100644 index 7fab64773..000000000 --- a/sources/pyside2/tests/QtWebKit/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -PYSIDE_TEST(bug_448.py) -PYSIDE_TEST(bug_694.py) -PYSIDE_TEST(bug_803.py) -PYSIDE_TEST(bug_899.py) -PYSIDE_TEST(bug_959.py) -PYSIDE_TEST(qvariantlist_property_test.py) -PYSIDE_TEST(qml_plugin_test.py) -PYSIDE_TEST(shouldInterruptjavascript_test.py) -PYSIDE_TEST(webpage_test.py) -PYSIDE_TEST(webview_test.py) -PYSIDE_TEST(webframe_test.py) diff --git a/sources/pyside2/tests/QtWebKit/bug_448.py b/sources/pyside2/tests/QtWebKit/bug_448.py deleted file mode 100644 index 98ebb1958..000000000 --- a/sources/pyside2/tests/QtWebKit/bug_448.py +++ /dev/null @@ -1,52 +0,0 @@ -############################################################################# -## -## Copyright (C) 2016 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$ -## -############################################################################# - -'''Test cases for bug: http://bugs.openbossa.org/show_bug.cgi?id=448''' - -import os -import sys -import unittest - -sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from init_paths import init_test_paths -init_test_paths(False) - -from PySide2.QtWidgets import QApplication -from PySide2.QtWebKit import QWebView - -class Bug448(unittest.TestCase): - def onError(self, erros): - pass - - def testReturnOwnership(self): - app = QApplication(sys.argv) - webview = QWebView() - webview.page().networkAccessManager().sslErrors.connect(self.onError) - -if __name__ == '__main__': - unittest.main() diff --git a/sources/pyside2/tests/QtWebKit/bug_694.py b/sources/pyside2/tests/QtWebKit/bug_694.py deleted file mode 100644 index b18d658f6..000000000 --- a/sources/pyside2/tests/QtWebKit/bug_694.py +++ /dev/null @@ -1,84 +0,0 @@ -############################################################################# -## -## Copyright (C) 2016 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$ -## -############################################################################# - -import os -import sys -import unittest - -sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from init_paths import init_test_paths -init_test_paths(False) - -from PySide2.QtCore import * -from PySide2.QtWidgets import * -from PySide2.QtWebKit import * - -class ErrorPage (QWebPage): - - def __init__(self): - QWebPage.__init__(self) - self.rcv_extension = None - self.rcv_url = None - self.rcv_url_copy = None - self.rcv_option_type = None - self.rcv_output_type = None - - - def supportsExtension(self, extension): - return extension == QWebPage.ErrorPageExtension - - def extension(self, extension, option, output): - self.rcv_extension = extension - self.rcv_url = option.url - self.rcv_url_copy = QUrl(option.url) - self.rcv_option_type = type(option) - self.rcv_output_type = type(output) - return True - -class TestWebPageExtension(unittest.TestCase): - def testIt(self): - app = QApplication([]) - ep = ErrorPage() - view = QWebView() - view.setPage(ep) - view.load("foo://bar") # Some malformmed url - view.show() - - # If the timeout is 0 the webpage isn't even loaded on Qt4.6-i386, so we use 100 :-) - QTimer.singleShot(100, app.quit) - app.exec_() - - self.assertEqual(ep.rcv_extension, QWebPage.ErrorPageExtension) - self.assertRaises(RuntimeError, ep.rcv_url.__str__) - - self.assertEqual(ep.rcv_url_copy, "foo://bar") - self.assertEqual(ep.rcv_option_type, QWebPage.ErrorPageExtensionOption) - self.assertEqual(ep.rcv_output_type, QWebPage.ErrorPageExtensionReturn) - -if __name__ == '__main__': - unittest.main() diff --git a/sources/pyside2/tests/QtWebKit/bug_803.py b/sources/pyside2/tests/QtWebKit/bug_803.py deleted file mode 100644 index ec6f93c33..000000000 --- a/sources/pyside2/tests/QtWebKit/bug_803.py +++ /dev/null @@ -1,53 +0,0 @@ -############################################################################# -## -## Copyright (C) 2016 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$ -## -############################################################################# - -import os -import sys -import unittest - -sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from init_paths import init_test_paths -init_test_paths(False) - -from PySide2.QtWidgets import * -from PySide2.QtWebKit import * - -class TestBug803 (unittest.TestCase): - - def testIt(self): - app = QApplication([]) - page = QWebPage() - frame = page.mainFrame() - frame.setHtml("<html><head></head><body><p>1</p><p>2</p></body></html>") - elems = frame.findAllElements("p") - self.assertEqual(len(elems), 2) - self.assertEqual(elems[0].toPlainText(), "1") - self.assertEqual(elems[1].toPlainText(), "2") - -if __name__ == "__main__": - unittest.main() diff --git a/sources/pyside2/tests/QtWebKit/bug_899.py b/sources/pyside2/tests/QtWebKit/bug_899.py deleted file mode 100644 index cb8e76784..000000000 --- a/sources/pyside2/tests/QtWebKit/bug_899.py +++ /dev/null @@ -1,71 +0,0 @@ -############################################################################# -## -## Copyright (C) 2016 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$ -## -############################################################################# - -import os -import sys -import unittest - -sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from init_paths import init_test_paths -init_test_paths(False) - -from PySide2.QtCore import Property, QObject -from PySide2.QtWebKit import QWebView -from helper.timedqapplication import TimedQApplication - -class TestLambdaPropery(TimedQApplication): - - def testBug899(self): - html = ''' - <html><body> - <script type="text/javascript"> - document.write("<p>"+py_obj.list1+"</p>") - document.write("<p>"+py_obj.list2+"</p>") - </script> - </body></html> - ''' - - class Obj(object): - list1 = ['foo', 'bar', 'baz'] - list2 = ['fi', 'fo', 'fum'] - - obj = Obj() - - wrapper_dict = {} - for name in ('list1', 'list2'): - getter = lambda arg=None, name=name: getattr(obj, name) - wrapper_dict[name] = Property('QVariantList', getter) - wrapper = type('PyObj', (QObject,), wrapper_dict) - - view = QWebView() - view.page().mainFrame().addToJavaScriptWindowObject('py_obj', wrapper()) - view.setHtml(html) - - -if __name__ == '__main__': - unittest.main() diff --git a/sources/pyside2/tests/QtWebKit/bug_959.py b/sources/pyside2/tests/QtWebKit/bug_959.py deleted file mode 100644 index 5214ee1e1..000000000 --- a/sources/pyside2/tests/QtWebKit/bug_959.py +++ /dev/null @@ -1,133 +0,0 @@ -############################################################################# -## -## Copyright (C) 2016 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 PySide2.QtCore import QObject, Slot, QTimer -from PySide2.QtWebKit import QWebView -from PySide2.QtWidgets import QApplication -from PySide2 import QtCore - -import os -import sys -import unittest - -sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from init_paths import init_test_paths -init_test_paths(False) - -from helper.usesqapplication import UsesQApplication - -functionID = -1 -currentWebView = None - -class JSFuncs(QObject): - @Slot(str,result=str) - def slot_str_str(self, x): - global functionID - functionID = 0 - return x.upper() - - @Slot(str,result='QVariant') - def slot_str_list(self, x): - global functionID - functionID = 1 - return [x, x] - - @Slot('QStringList',result=str) - def slot_strlist_str(self, x): - global functionID - functionID = 2 - return x[-1] - - @Slot('QVariant',result=str) - def slot_variant_str(self, x): - global functionID - functionID = 3 - return str(x) - - @Slot('QVariantList',result=str) - def slot_variantlist_str(self, x): - global functionID - functionID = 4 - return str(x[-1]) - - @Slot('QVariantMap',result=str) - def slot_variantmap_str(self, x): - global functionID - functionID = 5 - return str(x["foo"]) - - - -PAGE_DATA = "data:text/html,<!doctype html><html><body onload='%s'></body></html>" -FUNCTIONS_LIST = ['jsfuncs.slot_str_str("hello")', - 'jsfuncs.slot_str_list("hello")', - 'jsfuncs.slot_strlist_str(["hello","world"])', - 'jsfuncs.slot_variant_str("hello")', - 'jsfuncs.slot_variantlist_str(["hello","world"])', - 'jsfuncs.slot_variantmap_str({"foo": "bar"})'] - - -def onLoadFinished( result ): - QTimer.singleShot( 100, createNextWebView ) - -def createNextWebView(): - global functionID - - nListCount = len(FUNCTIONS_LIST) - 1 - functionID = functionID + 1 - print functionID - - if functionID < nListCount: - createWebView( functionID ) - else: - QTimer.singleShot(300, QApplication.instance().quit) - - -def createWebView( nIndex ): - global functionID - global currentWebView - - functionID = nIndex - currentWebView = QWebView() - currentWebView._jsfuncs = JSFuncs() - currentWebView.page().mainFrame().addToJavaScriptWindowObject("jsfuncs", currentWebView._jsfuncs) - QObject.connect( currentWebView, QtCore.SIGNAL('loadFinished( bool )'), onLoadFinished ) - currentWebView.load(PAGE_DATA % FUNCTIONS_LIST[ nIndex ]) - currentWebView.show() - -class Bug959(UsesQApplication): - - def testJavaScriptInWebViewForCrash( self ): - # wait for the webview load to be finished before creating the next webview - # don't create the webview inside of onLoadFinished - # also call onLoadFinished with the correct number of variables - createNextWebView() - self.app.exec_() - -if __name__ == "__main__": - unittest.main() diff --git a/sources/pyside2/tests/QtWebKit/fox.html b/sources/pyside2/tests/QtWebKit/fox.html deleted file mode 100644 index da873b1cc..000000000 --- a/sources/pyside2/tests/QtWebKit/fox.html +++ /dev/null @@ -1,7 +0,0 @@ -<html> -<title>Title</title> -<meta name="description" content="PySide Test METADATA." /> -<body> -<p>The quick <b>brown</b> fox <i>jumps</i> over the lazy dog.</p> -</body> -</html> diff --git a/sources/pyside2/tests/QtWebKit/qml_plugin_test.py b/sources/pyside2/tests/QtWebKit/qml_plugin_test.py deleted file mode 100644 index 33497bdc1..000000000 --- a/sources/pyside2/tests/QtWebKit/qml_plugin_test.py +++ /dev/null @@ -1,92 +0,0 @@ -############################################################################# -## -## Copyright (C) 2016 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$ -## -############################################################################# - -import os -import sys -import unittest - -sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from init_paths import init_test_paths -init_test_paths(False) - -from PySide2.QtCore import QUrl, QTimer -from PySide2.QtWidgets import QApplication, QLabel -from PySide2.QtWebKit import QWebPluginFactory, QWebView, QWebSettings - -from helper.usesqapplication import UsesQApplication - -class PluginFactory(QWebPluginFactory): - - def plugins(self): - plugins = [] - - mime = self.MimeType() - mime.name = 'DummyFile' - mime.fileExtensions = ['.pys'] - - plugin = self.Plugin() - plugin.name = 'DummyPlugin' - plugin.mimeTypes = [mime] - - plugins.append(plugin) - - return plugins - - def create(self, mimeType, url, argumentNames, argumentValues): - if mimeType != 'application/x-dummy': - return None - - for name, value in zip(argumentNames, argumentValues): - if name == 'text': - text = value - else: - text = "Webkit plugins!" - - widget = QLabel(text) - return widget - -class TestPlugin(UsesQApplication): - - def testPlugin(self): - view = QWebView() - fac = PluginFactory() - view.page().setPluginFactory(fac) - QWebSettings.globalSettings().setAttribute(QWebSettings.PluginsEnabled, True) - - view.load(QUrl(os.path.join(os.path.abspath(os.path.dirname(__file__)), 'qmlplugin', 'index.html'))) - - view.resize(840, 600) - view.show() - - QTimer.singleShot(500, self.app.quit) - - self.app.exec_() - - -if __name__ == '__main__': - unittest.main() diff --git a/sources/pyside2/tests/QtWebKit/qmlplugin/dummy.pys b/sources/pyside2/tests/QtWebKit/qmlplugin/dummy.pys deleted file mode 100644 index 0b7469da4..000000000 --- a/sources/pyside2/tests/QtWebKit/qmlplugin/dummy.pys +++ /dev/null @@ -1 +0,0 @@ -Foobar! diff --git a/sources/pyside2/tests/QtWebKit/qmlplugin/index.html b/sources/pyside2/tests/QtWebKit/qmlplugin/index.html deleted file mode 100644 index db0d6b5b2..000000000 --- a/sources/pyside2/tests/QtWebKit/qmlplugin/index.html +++ /dev/null @@ -1,5 +0,0 @@ -<html><body> - <h1>Custom Plugin</h1> - <object type="application/x-dummy" data="./dummy.pys" text="My text"> - </object> -</body></html> diff --git a/sources/pyside2/tests/QtWebKit/qvariantlist_property_test.py b/sources/pyside2/tests/QtWebKit/qvariantlist_property_test.py deleted file mode 100644 index 6a51a6488..000000000 --- a/sources/pyside2/tests/QtWebKit/qvariantlist_property_test.py +++ /dev/null @@ -1,78 +0,0 @@ -############################################################################# -## -## Copyright (C) 2016 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$ -## -############################################################################# - -import os -import sys -import unittest - -sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from init_paths import init_test_paths -init_test_paths(False) - -from PySide2.QtCore import Property, QObject -from PySide2.QtWebKit import QWebView -from helper.timedqapplication import TimedQApplication - -class TestLoadFinished(TimedQApplication): - - def setUp(self): - TimedQApplication.setUp(self, timeout=1000) - - def tearDown(self): - TimedQApplication.tearDown(self) - - def testQVariantListProperty(self): - class Obj(object): - list = ['foo', 'bar', 'baz'] - - obj = Obj() - - wrapper_dict = {} - for name in ['list']: - getter = lambda arg=None, name=name: getattr(obj, name) - wrapper_dict[name] = Property('QVariantList', getter) - wrapper = type('PyObj', (QObject,), wrapper_dict) - - view = QWebView() - frame = view.page().mainFrame() - frame.addToJavaScriptWindowObject('py_obj', wrapper()) - - html = ''' - <html><body> - <script type="text/javascript"> - document.write(py_obj.list) - </script> - </body></html> - ''' - view.setHtml(html) - view.show() - self.app.exec_() - - -if __name__ == '__main__': - unittest.main() diff --git a/sources/pyside2/tests/QtWebKit/shouldInterruptjavascript_test.py b/sources/pyside2/tests/QtWebKit/shouldInterruptjavascript_test.py deleted file mode 100644 index 4db5adbb5..000000000 --- a/sources/pyside2/tests/QtWebKit/shouldInterruptjavascript_test.py +++ /dev/null @@ -1,63 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- - -############################################################################# -## -## Copyright (C) 2016 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$ -## -############################################################################# - -import os -import sys -import unittest - -sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from init_paths import init_test_paths -init_test_paths(False) - -from PySide2 import QtCore, QtWebKit - -from helper.usesqapplication import UsesQApplication - -class QWebPageHeadless(QtWebKit.QWebPage): - # FIXME: This is not working, the slot is not overriden! - # http://doc.qt.nokia.com/4.7-snapshot/qwebpage.html#shouldInterruptJavaScript - @QtCore.Slot() - def shouldInterruptJavaScript(self): - self._interrupted = True - QtCore.QTimer.singleShot(300, self._app.quit) - return True - -class TestSlotOverride(UsesQApplication): - def testFunctionCall(self): - page = QWebPageHeadless() - page._interrupted = False - page._app = self.app - page.mainFrame().setHtml('<script>while(1);</script>') - self.app.exec_() - self.assertTrue(page._interrupted) - -if __name__ == '__main__': - unittest.main() diff --git a/sources/pyside2/tests/QtWebKit/webframe_test.py b/sources/pyside2/tests/QtWebKit/webframe_test.py deleted file mode 100644 index d46c1b229..000000000 --- a/sources/pyside2/tests/QtWebKit/webframe_test.py +++ /dev/null @@ -1,67 +0,0 @@ -############################################################################# -## -## Copyright (C) 2016 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$ -## -############################################################################# - -import os -import sys -import unittest - -sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from init_paths import init_test_paths -init_test_paths(False) - -from PySide2.QtCore import QObject, SIGNAL, QUrl -from PySide2.QtWebKit import * -from PySide2.QtNetwork import QNetworkRequest - -from helper.helper import adjust_filename -from helper.usesqapplication import UsesQApplication - - -class TestWebFrame(UsesQApplication): - def load_finished(self, ok): - self.assertTrue(ok) - page = self.view.page() - self.assertTrue(page) - frame = page.mainFrame() - self.assertTrue(frame) - meta = frame.metaData() - self.assertEqual(meta['description'], ['PySide Test METADATA.']) - self.app.quit() - - def testMetaData(self): - self.view = QWebView() - QObject.connect(self.view, SIGNAL('loadFinished(bool)'), - self.load_finished) - url = QUrl.fromLocalFile(adjust_filename('fox.html', __file__)) - self.view.setUrl(url) - self.app.exec_() - - -if __name__ == '__main__': - unittest.main() - diff --git a/sources/pyside2/tests/QtWebKit/webpage_test.py b/sources/pyside2/tests/QtWebKit/webpage_test.py deleted file mode 100644 index 0c37befa2..000000000 --- a/sources/pyside2/tests/QtWebKit/webpage_test.py +++ /dev/null @@ -1,95 +0,0 @@ -############################################################################# -## -## Copyright (C) 2016 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$ -## -############################################################################# - -'''Test cases for QWebPage''' - -import os -import sys -import unittest - -sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from init_paths import init_test_paths -init_test_paths(False) - -from PySide2.QtCore import QObject, SIGNAL, QUrl -from PySide2.QtWebKit import QWebPage -from PySide2.QtNetwork import QNetworkAccessManager - -from helper.helper import adjust_filename -from helper.timedqapplication import TimedQApplication - -#Define a global timeout because TimedQApplication uses a singleton! -#Use a value big enough to run all the tests. -TIMEOUT = 1000 - -class TestFindText(TimedQApplication): - '''Test cases for finding text''' - - def setUp(self): - TimedQApplication.setUp(self, timeout=TIMEOUT) - self.page = QWebPage() - QObject.connect(self.page, SIGNAL('loadFinished(bool)'), - self.load_finished) - self.called = False - - def tearDown(self): - #Release resources - del self.page - self.called = False - TimedQApplication.tearDown(self) - - def testFindSelectText(self): - url = QUrl.fromLocalFile(adjust_filename('fox.html', __file__)) - self.page.mainFrame().load(url) - self.app.exec_() - self.assertTrue(self.called) - - def load_finished(self, ok): - #Callback to check if load was successful - if ok: - self.called = True - self.assertTrue(self.page.findText('fox')) - self.assertEqual(self.page.selectedText(), 'fox') - self.app.quit() - -class SetNetworkAccessManagerCase(TimedQApplication): - - def setUp(self): - TimedQApplication.setUp(self, timeout=TIMEOUT) - - def testSetNetworkAccessManager(self): - page = QWebPage() - manager = QNetworkAccessManager() - page.setNetworkAccessManager(manager) - - def testNetWorkAccessManager(self): - page = QWebPage() - a = page.networkAccessManager() - -if __name__ == '__main__': - unittest.main() diff --git a/sources/pyside2/tests/QtWebKit/webview_test.py b/sources/pyside2/tests/QtWebKit/webview_test.py deleted file mode 100644 index 5ecac5387..000000000 --- a/sources/pyside2/tests/QtWebKit/webview_test.py +++ /dev/null @@ -1,101 +0,0 @@ -############################################################################# -## -## Copyright (C) 2016 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$ -## -############################################################################# - -'''Test cases for QWebView''' - -import os -import sys -import unittest - -sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from init_paths import init_test_paths -init_test_paths(False) - -import py3kcompat as py3k - -from PySide2.QtCore import QObject, SIGNAL, QUrl -from PySide2.QtWebKit import QWebPage, QWebView -from PySide2.QtNetwork import QNetworkRequest - -from helper.helper import adjust_filename -from helper.timedqapplication import TimedQApplication - - -class testWebPage(QWebPage): - def sayMyName(self): - return 'testWebPage' - -class TestLoadFinished(TimedQApplication): - '''Test case for signal QWebView.loadFinished(bool)''' - - def setUp(self): - #Acquire resources - TimedQApplication.setUp(self, timeout=1000) - self.view = QWebView() - QObject.connect(self.view, SIGNAL('loadFinished(bool)'), - self.load_finished) - self.called = False - - def tearDown(self): - #Release resources - del self.view - self.called = False - TimedQApplication.tearDown(self) - - def testLoadFinishedFromFile(self): - url = QUrl.fromLocalFile(adjust_filename('fox.html', __file__)) - self.view.setUrl(url) - self.app.exec_() - - self.assertTrue(self.called) - - def testSetPageAndGetPage(self): - twp = testWebPage() - self.view.setPage(twp) - del twp - p = self.view.page() - self.assertEqual(p.sayMyName(), 'testWebPage') - - # Setting the same webpage should not incref the python obj - refCount = sys.getrefcount(p) - self.view.setPage(p) - self.assertEqual(sys.getrefcount(p), refCount) - - # Changing the webpage obj should decref the old one - twp2 = testWebPage() - self.view.setPage(twp2) - self.assertEqual(sys.getrefcount(p), refCount - 1) - - def load_finished(self, ok): - #Callback to check if load was successful - self.app.quit() - if ok: - self.called = True - -if __name__ == '__main__': - unittest.main() diff --git a/sources/pyside2/tests/QtWebKitWidgets/CMakeLists.txt b/sources/pyside2/tests/QtWebKitWidgets/CMakeLists.txt deleted file mode 100644 index 2f7cb08b9..000000000 --- a/sources/pyside2/tests/QtWebKitWidgets/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -# Please add some tests, here diff --git a/sources/pyside2/tests/tools/list-class-hierarchy.py b/sources/pyside2/tests/tools/list-class-hierarchy.py index b734ae69e..70075b27e 100755 --- a/sources/pyside2/tests/tools/list-class-hierarchy.py +++ b/sources/pyside2/tests/tools/list-class-hierarchy.py @@ -87,7 +87,6 @@ if __name__=='__main__': 'QtSvg', 'QtTest', #'QtUiTools', - 'QtWebKit', 'QtXml', 'QtXmlPatterns' ] diff --git a/sources/pyside2/tests/util/module_wrapper/PySide/QtWebKit.py b/sources/pyside2/tests/util/module_wrapper/PySide/QtWebKit.py deleted file mode 100644 index bffc79968..000000000 --- a/sources/pyside2/tests/util/module_wrapper/PySide/QtWebKit.py +++ /dev/null @@ -1,2 +0,0 @@ - -from PyQt4.QtWebKit import * |