2 files changed, 27 insertions, 1 deletions
diff --git a/sources/pyside6/PySide6/QtWebView/CMakeLists.txt b/sources/pyside6/PySide6/QtWebView/CMakeLists.txt
index 158c720c9..a8ac8c2a2 100644
--- a/sources/pyside6/PySide6/QtWebView/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtWebView/CMakeLists.txt
@@ -25,7 +25,8 @@ set(QtWebView_libraries pyside6
 set(QtWebView_deps QtGui)
 
 # for Windows and Linux, QtWebView depends on QtWebEngine to render content
-if ((WIN32 OR UNIX) AND NOT APPLE)
+# On Android, QtWebView uses the native webview backend and does not require QtWebEngine.
+if ((WIN32 OR UNIX) AND NOT APPLE AND NOT ANDROID)
     list(APPEND QtWebView_deps QtWebEngineCore QtWebEngineQuick)
 endif()
 
diff --git a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/mapping.py b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/mapping.py
index a175fb5ee..9d1c3fd5f 100644
--- a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/mapping.py
+++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/mapping.py
@@ -743,6 +743,7 @@ def init_testbinding():
 
 # Functions which should return Optional(result) but don't.
 missing_optional_return = {
+    "PySide6.QtCore.QObject.parent",
     "PySide6.QtGui.QGuiApplication.modalWindow",
     "PySide6.QtGui.QGuiApplication.screenAt",
     "PySide6.QtWidgets.QApplication.activeModalWidget",
@@ -752,17 +753,41 @@ missing_optional_return = {
     "PySide6.QtWidgets.QApplication.setStyle",
     "PySide6.QtWidgets.QApplication.topLevelAt",
     "PySide6.QtWidgets.QApplication.widgetAt",
+    "PySide6.QtWidgets.QBoxLayout.itemAt",
+    "PySide6.QtWidgets.QBoxLayout.takeAt",
+    "PySide6.QtWidgets.QButtonGroup.checkedButton",
     "PySide6.QtWidgets.QComboBox.completer",
     "PySide6.QtWidgets.QComboBox.lineEdit",
     "PySide6.QtWidgets.QComboBox.validator",
     "PySide6.QtWidgets.QCompleter.popup",
+    "PySide6.QtWidgets.QFormLayout.itemAt",
+    "PySide6.QtWidgets.QFormLayout.takeAt",
+    "PySide6.QtWidgets.QGraphicsAnchorLayout.itemAt",
+    "PySide6.QtWidgets.QGraphicsGridLayout.itemAt",
+    "PySide6.QtWidgets.QGraphicsLayout.itemAt",
+    "PySide6.QtWidgets.QGraphicsLinearLayout.itemAt",
+    "PySide6.QtWidgets.QGraphicsScene.itemAt",
+    "PySide6.QtWidgets.QGraphicsView.itemAt",
     "PySide6.QtWidgets.QGridLayout.itemAt",
     "PySide6.QtWidgets.QGridLayout.itemAtPosition",
+    "PySide6.QtWidgets.QGridLayout.takeAt",
     "PySide6.QtWidgets.QLayout.itemAt",
+    "PySide6.QtWidgets.QLayout.replaceWidget",
+    "PySide6.QtWidgets.QLayout.takeAt",
+    "PySide6.QtWidgets.QListWidget.itemAt",
+    "PySide6.QtWidgets.QScrollArea.widget",
+    "PySide6.QtWidgets.QSplitter.widget",
+    "PySide6.QtWidgets.QStackedLayout.itemAt",
+    "PySide6.QtWidgets.QStackedLayout.takeAt",
+    "PySide6.QtWidgets.QStackedLayout.widget",
+    "PySide6.QtWidgets.QStackedWidget.widget",
+    "PySide6.QtWidgets.QTabWidget.widget",
     "PySide6.QtWidgets.QTableWidget.horizontalHeaderItem",
     "PySide6.QtWidgets.QTableWidget.item",
     "PySide6.QtWidgets.QTableWidget.itemAt",
     "PySide6.QtWidgets.QTableWidget.mimeData",
+    "PySide6.QtWidgets.QToolBox.widget",
+    "PySide6.QtWidgets.QTreeWidget.itemAt",
     "PySide6.QtWidgets.QTreeWidget.takeTopLevelItem",
     "PySide6.QtWidgets.QTreeWidget.topLevelItem",
     "PySide6.QtWidgets.QWidget.childAt",