41 lines
1.7 KiB
Diff
41 lines
1.7 KiB
Diff
From 6f0068359f32d1e7ebaa32650c3b608c008a1127 Mon Sep 17 00:00:00 2001
|
|
From: Nick Cao <nickcao@nichi.co>
|
|
Date: Tue, 10 Oct 2023 11:46:28 -0400
|
|
Subject: [PATCH 2/2] qtwebengine: fix path to locales
|
|
|
|
---
|
|
src/core/api/CMakeLists.txt | 3 ++-
|
|
src/core/web_engine_library_info.cpp | 3 ++-
|
|
2 files changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/core/api/CMakeLists.txt b/src/core/api/CMakeLists.txt
|
|
index a3cb53e17..fcb6d70c5 100644
|
|
--- a/src/core/api/CMakeLists.txt
|
|
+++ b/src/core/api/CMakeLists.txt
|
|
@@ -190,7 +190,8 @@ if(QT_FEATURE_framework)
|
|
|
|
else()
|
|
install(FILES ${localeFiles}
|
|
- DESTINATION ${INSTALL_TRANSLATIONSDIR}/qtwebengine_locales
|
|
+ # Nixpkgs: INSTALL_TRANSLATIONSDIR points to Qt base translations store path
|
|
+ DESTINATION ${INSTALL_DATADIR}/qtwebengine_locales
|
|
CONFIGURATIONS ${config}
|
|
)
|
|
install(FILES ${resourceFiles}
|
|
diff --git a/src/core/web_engine_library_info.cpp b/src/core/web_engine_library_info.cpp
|
|
index c03c9a3b2..430fdfab2 100644
|
|
--- a/src/core/web_engine_library_info.cpp
|
|
+++ b/src/core/web_engine_library_info.cpp
|
|
@@ -203,7 +203,8 @@ QString localesPath()
|
|
candidatePaths << getResourcesPath(frameworkBundle()) % QDir::separator()
|
|
% QLatin1String("qtwebengine_locales");
|
|
#endif
|
|
- candidatePaths << QLibraryInfo::path(QLibraryInfo::TranslationsPath) % QDir::separator()
|
|
+ // Nixpkgs: match the changes made in CMakeLists.txt
|
|
+ candidatePaths << QLibraryInfo::path(QLibraryInfo::DataPath) % QDir::separator()
|
|
% QLatin1String("qtwebengine_locales");
|
|
candidatePaths << fallbackDir();
|
|
}
|
|
--
|
|
2.42.0
|
|
|