10 files changed, 32 insertions, 15 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 20ef91637..3b2e21d9b 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -356,9 +356,14 @@ foreach(arch ${archs})
         )
         extend_gn_list(gnArgArg
             ARGS enable_plugins
-            CONDITION QT_FEATURE_webengine_pepper_plugins
+            CONDITION QT_FEATURE_webengine_printing_and_pdf OR
+            QT_FEATURE_webengine_pepper_plugins
         )
         extend_gn_list(gnArgArg
+            ARGS enable_ppapi
+            CONDITION QT_FEATURE_webengine_pepper_plugins
+        )
+         extend_gn_list(gnArgArg
             ARGS enable_spellcheck
             CONDITION QT_FEATURE_webengine_spellchecker
         )
diff --git a/src/core/api/Qt6WebEngineCoreMacros.cmake b/src/core/api/Qt6WebEngineCoreMacros.cmake
index 6c335aad1..8bb731548 100644
--- a/src/core/api/Qt6WebEngineCoreMacros.cmake
+++ b/src/core/api/Qt6WebEngineCoreMacros.cmake
@@ -29,7 +29,7 @@ function(qt6_add_webengine_dictionary)
         set(copyCommand COMMAND ${CMAKE_COMMAND} -E copy_directory ${ARGS_OUTPUT_DIRECTORY}/dict
            ${ARGS_OUTPUT_DIRECTORY}/$<CONFIG>
         )
-    elseif((MACOS OR IOS) AND isBundle)
+    elseif(APPLE AND isBundle)
         get_target_property(outputName ${ARGS_TARGET} OUTPUT_NAME)
         if(NOT outputName)
            set(outputName ${ARGS_TARGET})
diff --git a/src/core/api/configure.cmake b/src/core/api/configure.cmake
index 48f7cacc0..49ad00ed8 100644
--- a/src/core/api/configure.cmake
+++ b/src/core/api/configure.cmake
@@ -13,7 +13,7 @@ if(NOT QT_CONFIGURE_RUNNING)
         pkg_check_modules(XDAMAGE xdamage)
         pkg_check_modules(POPPLER_CPP poppler-cpp IMPORTED_TARGET)
         pkg_check_modules(GBM gbm)
-        pkg_check_modules(LIBVA libva)
+        pkg_check_modules(LIBVA libva>=1.14)
         if(NOT GIO_FOUND)
             pkg_check_modules(GIO gio-2.0)
         endif()
@@ -66,7 +66,7 @@ qt_feature("webengine-system-alsa" PRIVATE
 )
 qt_feature("webengine-v8-context-snapshot" PRIVATE
     LABEL "Use v8 context snapshot"
-    CONDITION NOT CMAKE_CROSSCOMPILING
+    AUTODETECT NOT CMAKE_CROSSCOMPILING
 )
 qt_feature("webengine-geolocation" PUBLIC
     LABEL "Geolocation"
diff --git a/src/core/configure/BUILD.root.gn.in b/src/core/configure/BUILD.root.gn.in
index 7b61ff4ef..fe4f306b0 100644
--- a/src/core/configure/BUILD.root.gn.in
+++ b/src/core/configure/BUILD.root.gn.in
@@ -356,20 +356,24 @@ source_set("qtwebengine_sources") {
     "//components/embedder_support/user_agent_utils.cc",
     "//components/embedder_support/user_agent_utils.h",
   ]
-  if (use_ozone && use_vaapi) {
+  if (use_vaapi_x11) {
     deps += [
       "//ui/base/x:gl",
       "//ui/gfx/linux:gpu_memory_buffer_support_x11",
     ]
     sources += [
-      "//ui/ozone/platform/wayland/gpu/wayland_gl_egl_utility.cc",
-      "//ui/ozone/platform/wayland/gpu/wayland_gl_egl_utility.h",
       "//ui/ozone/platform/x11/gl_egl_utility_x11.cc",
       "//ui/ozone/platform/x11/gl_egl_utility_x11.h",
       "//ui/ozone/platform/x11/native_pixmap_glx_binding.cc",
       "//ui/ozone/platform/x11/native_pixmap_glx_binding.h",
     ]
   }
+  if (use_vaapi) {
+    sources += [
+      "//ui/ozone/platform/wayland/gpu/wayland_gl_egl_utility.cc",
+      "//ui/ozone/platform/wayland/gpu/wayland_gl_egl_utility.h",
+    ]
+  }
   if (enable_extensions) {
     deps += [
       ":qtwebengine_extensions_features",
diff --git a/src/core/doc/src/qwebenginepage_lgpl.qdoc b/src/core/doc/src/qwebenginepage_lgpl.qdoc
index 8f8f50968..a8a31da11 100644
--- a/src/core/doc/src/qwebenginepage_lgpl.qdoc
+++ b/src/core/doc/src/qwebenginepage_lgpl.qdoc
@@ -710,6 +710,7 @@
     is empty, it is assumed that the content is \c{text/plain,charset=US-ASCII}.
 
     External objects referenced in the content are located relative to \a baseUrl.
+    For external objects with relative URLs to be loaded, \c baseUrl cannot be empty.
 
     The \a data is loaded immediately; external objects are loaded asynchronously.
 
diff --git a/src/core/doc/src/qwebenginesettings_lgpl.qdoc b/src/core/doc/src/qwebenginesettings_lgpl.qdoc
index 63e9c9710..d98cef8c9 100644
--- a/src/core/doc/src/qwebenginesettings_lgpl.qdoc
+++ b/src/core/doc/src/qwebenginesettings_lgpl.qdoc
@@ -15,8 +15,8 @@
     \inmodule QtWebEngineCore
 
     QWebEngineSettings allows configuration of browser properties, such as font sizes and
-    families, the location of a custom style sheet, and generic attributes, such as JavaScript
-    support. Individual attributes are set using the setAttribute() function. The
+    families, and generic attributes, such as JavaScript support.
+    Individual attributes are set using the setAttribute() function. The
     \l{QWebEngineSettings::WebAttribute}{WebAttribute} enum further describes each attribute.
 
     Each QWebEnginePage object has its own QWebEngineSettings object, which configures the
diff --git a/src/core/ozone/ozone_platform_qt.cpp b/src/core/ozone/ozone_platform_qt.cpp
index 8dcb56446..12a204f20 100644
--- a/src/core/ozone/ozone_platform_qt.cpp
+++ b/src/core/ozone/ozone_platform_qt.cpp
@@ -70,13 +70,14 @@ public:
         static OzonePlatform::PlatformRuntimeProperties properties;
 #if BUILDFLAG(USE_VAAPI)
         if (has_initialized_gpu()) {
+#if BUILDFLAG(USE_VAAPI_X11)
             if (GetQtXDisplay()) {
                 // This property is set when the GetPlatformRuntimeProperties is
                 // called on the gpu process side.
                 properties.supports_native_pixmaps = ui::GpuMemoryBufferSupportX11::GetInstance()->has_gbm_device();
-            } else {
+            } else
+#endif
                 properties.supports_native_pixmaps = true; // buffer_manager_->GetGbmDevice() != nullptr
-            }
         }
 #endif
         return properties;
diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
index 64ccd529d..d00f66335 100644
--- a/src/core/web_contents_delegate_qt.cpp
+++ b/src/core/web_contents_delegate_qt.cpp
@@ -311,6 +311,9 @@ void WebContentsDelegateQt::RenderViewHostChanged(content::RenderViewHost *, con
         Q_ASSERT(rwhv->delegate());
         rwhv->delegate()->adapterClientChanged(m_viewClient);
         m_viewClient->zoomUpdateIsNeeded();
+        auto backgroundColor = m_viewClient->backgroundColor();
+        if (backgroundColor != Qt::white)
+            m_viewClient->webContentsAdapter()->setBackgroundColor(backgroundColor);
     }
 }
 
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index ae85bb2d6..81de7833f 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -601,9 +601,6 @@ const static char kDisableInProcGpuThread[] = "QTWEBENGINE_DISABLE_GPU_THREAD";
 bool WebEngineContext::isGpuServiceOnUIThread()
 {
     static bool threadedGpu =
-#if QT_CONFIG(opengl) && !defined(Q_OS_MACOS)
-            QOpenGLContext::supportsThreadedOpenGL() &&
-#endif
             !qEnvironmentVariableIsSet(kDisableInProcGpuThread);
     return !threadedGpu;
 }
@@ -985,7 +982,7 @@ const char *qWebEngineChromiumVersion() noexcept
 
 const char *qWebEngineChromiumSecurityPatchVersion() noexcept
 {
-    return "121.0.6167.160"; // FIXME: Remember to update
+    return "124.0.6367.208"; // FIXME: Remember to update
 }
 
 QT_END_NAMESPACE
diff --git a/src/core/web_engine_library_info.cpp b/src/core/web_engine_library_info.cpp
index c03c9a3b2..e71153899 100644
--- a/src/core/web_engine_library_info.cpp
+++ b/src/core/web_engine_library_info.cpp
@@ -284,6 +284,12 @@ QString dictionariesPath()
                 break;
             }
         }
+
+        if (potentialDictionariesPath.isEmpty()) {
+            // return path for error message
+            potentialDictionariesPath = QCoreApplication::applicationDirPath() % QDir::separator()
+                    % QLatin1String("qtwebengine_dictionaries");
+        }
     }
 
     return potentialDictionariesPath;