aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShyamnath Premnadh <[email protected]>2024-12-17 10:51:38 +0100
committerShyamnath Premnadh <[email protected]>2024-12-17 12:02:23 +0100
commite89255f981821967330c6046187c8942f7ca32a0 (patch)
treea2286b645d1233bb5bb49e349e8f6b8ce14964fd
parente5d047ad6e3984ea8fccbdac0f896511fbe1fdaf (diff)
PySide: Add WebView for macOS
- caused by wrong condition check in 83603fed574fc7b0eed452b347170862b12a98f6 Pick-to: 6.8 Fixes: PYSIDE-2964 Change-Id: I1b5c441cd7448898e44f8d829b91202e68168666 Reviewed-by: Friedemann Kleint <[email protected]>
-rw-r--r--sources/pyside6/cmake/PySideHelpers.cmake2
-rw-r--r--sources/pyside6/tests/QtWebView/CMakeLists.txt7
-rw-r--r--sources/pyside6/tests/QtWebView/QtWebView.pyproject3
-rw-r--r--sources/pyside6/tests/QtWebView/test_webview.py33
4 files changed, 41 insertions, 4 deletions
diff --git a/sources/pyside6/cmake/PySideHelpers.cmake b/sources/pyside6/cmake/PySideHelpers.cmake
index f8b565a58..ad94f278f 100644
--- a/sources/pyside6/cmake/PySideHelpers.cmake
+++ b/sources/pyside6/cmake/PySideHelpers.cmake
@@ -133,7 +133,7 @@ macro(collect_optional_modules)
WebEngineQuick WebSockets HttpServer)
find_package(Qt${QT_MAJOR_VERSION}WebEngineQuick)
# for Windows and Linux, QtWebView depends on QtWebEngine to render content
- if ((WIN32 OR UNIX) AND NOT APPLE AND Qt${QT_MAJOR_VERSION}WebEngineQuick_FOUND)
+ if(Qt${QT_MAJOR_VERSION}WebEngineQuick_FOUND OR APPLE)
list(APPEND ALL_OPTIONAL_MODULES WebView)
endif()
list(APPEND ALL_OPTIONAL_MODULES 3DCore 3DRender 3DInput 3DLogic 3DAnimation 3DExtras)
diff --git a/sources/pyside6/tests/QtWebView/CMakeLists.txt b/sources/pyside6/tests/QtWebView/CMakeLists.txt
index 63f313639..ccbf9adf1 100644
--- a/sources/pyside6/tests/QtWebView/CMakeLists.txt
+++ b/sources/pyside6/tests/QtWebView/CMakeLists.txt
@@ -1,4 +1,5 @@
-# Copyright (C) 2023 The Qt Company Ltd.
-# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (C) 2024 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+PYSIDE_TEST(test_webview.py)
-# Tests to be added later
diff --git a/sources/pyside6/tests/QtWebView/QtWebView.pyproject b/sources/pyside6/tests/QtWebView/QtWebView.pyproject
new file mode 100644
index 000000000..ccc8a6850
--- /dev/null
+++ b/sources/pyside6/tests/QtWebView/QtWebView.pyproject
@@ -0,0 +1,3 @@
+{
+ "files": ["test_webview.py"]
+}
diff --git a/sources/pyside6/tests/QtWebView/test_webview.py b/sources/pyside6/tests/QtWebView/test_webview.py
new file mode 100644
index 000000000..e8f4ecc6b
--- /dev/null
+++ b/sources/pyside6/tests/QtWebView/test_webview.py
@@ -0,0 +1,33 @@
+# Copyright (C) 2024 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+from __future__ import annotations
+
+'''Unit test for WebView'''
+
+import os
+import sys
+import unittest
+from pathlib import Path
+
+# Append the necessary paths to sys.path
+sys.path.append(os.fspath(Path(__file__).resolve().parents[1]))
+from init_paths import init_test_paths
+init_test_paths(False)
+
+from PySide6.QtWebView import QtWebView
+
+from helper.usesqapplication import UsesQApplication
+
+
+class QWebViewTestCase(UsesQApplication):
+ def test_webview_exists(self):
+ # Initialize QtWebView
+ QtWebView.initialize()
+
+ # Check if QtWebView can be initialized
+ self.assertTrue(QtWebView is not None)
+ print("QtWebView is available in PySide6.")
+
+
+if __name__ == "__main__":
+ unittest.main()