From 5e238ea68de463401f7cc5242796bc52fbf46801 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 22 Apr 2026 13:51:13 +0200 Subject: [PATCH] lomiri-qt6.lomiri-ui-toolkit: Fix Qt 6.11 compatibility --- .../lomiri/qml/lomiri-ui-toolkit/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix index 050a538c9dc1..4711cf27b81f 100644 --- a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix +++ b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix @@ -128,6 +128,18 @@ stdenv.mkDerivation (finalAttrs: { tests/unit/visual/tst_imageprovider.11.qml \ --replace-fail '/usr/share' '${suru-icon-theme}/share' '' + # Adjust to Qt 6.11, TODO report & submit upstream + + lib.optionalString withQt6 '' + substituteInPlace apicheck/apicheck.cpp \ + --replace-fail \ + 'attachedPropertiesType(QQmlEnginePrivate::get(currentEngine))' \ + 'attachedPropertiesType(QQmlTypeLoader::get(currentEngine))' + + substituteInPlace src/LomiriToolkit/ucstylehints.cpp \ + --replace-fail \ + 'QQmlEnginePrivate::getV4Engine(qmlEngine(this))' \ + 'qmlEngine(this)->handle()' + '' + lib.optionalString (!withQt6) '' for subproject in po app-launch-profiler lomiri-ui-toolkit-launcher; do substituteInPlace $subproject/$subproject.pro \