646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
28 lines
1.3 KiB
Diff
28 lines
1.3 KiB
Diff
diff --git a/src/core/api/CMakeLists.txt b/src/core/api/CMakeLists.txt
|
|
index dbe881ecf..9ba6ceffe 100644
|
|
--- a/src/core/api/CMakeLists.txt
|
|
+++ b/src/core/api/CMakeLists.txt
|
|
@@ -214,7 +214,7 @@ if(QT_FEATURE_framework)
|
|
)
|
|
|
|
else()
|
|
- set(locale_install_path "${INSTALL_TRANSLATIONSDIR}/qtwebengine_locales")
|
|
+ set(locale_install_path "${INSTALL_DATADIR}/qtwebengine_locales")
|
|
install(FILES ${localeFiles}
|
|
DESTINATION ${locale_install_path}
|
|
CONFIGURATIONS ${config}
|
|
diff --git a/src/core/web_engine_library_info.cpp b/src/core/web_engine_library_info.cpp
|
|
index ef88a59b8..d63de34c8 100644
|
|
--- a/src/core/web_engine_library_info.cpp
|
|
+++ b/src/core/web_engine_library_info.cpp
|
|
@@ -198,7 +198,8 @@ QString localesPath()
|
|
candidatePaths << getResourcesPath(frameworkBundle()) % QDir::separator()
|
|
% "qtwebengine_locales"_L1;
|
|
#endif
|
|
- candidatePaths << QLibraryInfo::path(QLibraryInfo::TranslationsPath) % QDir::separator()
|
|
+ // Nixpkgs: match the changes made in CMakeLists.txt
|
|
+ candidatePaths << QLibraryInfo::path(QLibraryInfo::DataPath) % QDir::separator()
|
|
% "qtwebengine_locales"_L1;
|
|
candidatePaths << fallbackDir();
|
|
} else {
|