[qt5-declarative] Reduce memory pressure while linking tools (#49670)

2026-01-29 14:23:46 -08:00
parent 2e93c857c5
commit 433fb10a15
5 changed files with 28 additions and 2 deletions
@@ -0,0 +1,14 @@
+diff --git a/tools/tools.pro b/tools/tools.pro
+index 2e04f933..319faeae 100644
+--- a/tools/tools.pro
+++ b/tools/tools.pro
+@@ -1,6 +1,9 @@
+ TEMPLATE = subdirs
+ QT_FOR_CONFIG += qml-private
+ 
+# Reduce memory pressure during linking
+CONFIG += ordered
+
+ qtConfig(qml-devtools) {
+     SUBDIRS += \
+         qmllint \
@@ -6,7 +6,13 @@ else()
    list(APPEND CORE_OPTIONS -no-d3d12)
 endif()

-qt_submodule_installation(OUT_SOURCE_PATH SOURCE_PATH BUILD_OPTIONS ${CORE_OPTIONS})
+qt_submodule_installation(
+    OUT_SOURCE_PATH SOURCE_PATH
+    PATCHES
+        linker-oom.diff
+    BUILD_OPTIONS
+        ${CORE_OPTIONS}
+)

 if(NOT QT_UPDATE_VERSION)
  vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/qt5/QtQml/${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}/QtQml/private/qqmljsparser_p.h" "${SOURCE_PATH}" "")
@@ -1,6 +1,7 @@
 {
  "name": "qt5-declarative",
  "version": "5.15.18",
+  "port-version": 1,
  "description": "Qt Declarative (Quick 2)",
  "license": null,
  "dependencies": [
@@ -8058,7 +8058,7 @@
    },
    "qt5-declarative": {
      "baseline": "5.15.18",
-      "port-version": 0
+      "port-version": 1
    },
    "qt5-doc": {
      "baseline": "5.15.18",
@@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "3e5e184c2f19e06bf02d51c993894126072bc52a",
+      "version": "5.15.18",
+      "port-version": 1
+    },
    {
      "git-tree": "25e69d1575c17727384a03b8a85ce3e437893198",
      "version": "5.15.18",