1From c4d1caad764372d2a852fb837e7c37e168c65f0c Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Mon, 18 Feb 2019 10:45:03 +0200
4Subject: [PATCH] linguist-tools cmake: allow overriding the location for
5 lupdate and lrelease
6
7Upstream-Status: Pending
8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9---
10 src/linguist/Qt5LinguistToolsConfig.cmake.in | 6 +++---
11 1 file changed, 3 insertions(+), 3 deletions(-)
12
13diff --git a/src/linguist/Qt5LinguistToolsConfig.cmake.in b/src/linguist/Qt5LinguistToolsConfig.cmake.in
14index 2e99bc76..e6f4f7ed 100644
15--- a/src/linguist/Qt5LinguistToolsConfig.cmake.in
16+++ b/src/linguist/Qt5LinguistToolsConfig.cmake.in
17@@ -47,7 +47,7 @@ if (NOT TARGET Qt5::lrelease)
18 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
19     set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
20 !!ELSE
21-    set(imported_location \"$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
22+    set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lrelease${OE_QMAKE_BIN_SUFFIX}\")
23 !!ENDIF
24     _qt5_LinguistTools_check_file_exists(${imported_location})
25
26@@ -62,7 +62,7 @@ if (NOT TARGET Qt5::lupdate)
27 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
28     set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
29 !!ELSE
30-    set(imported_location \"$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
31+    set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lupdate${OE_QMAKE_BIN_SUFFIX}\")
32 !!ENDIF
33     _qt5_LinguistTools_check_file_exists(${imported_location})
34
35@@ -77,7 +77,7 @@ if (NOT TARGET Qt5::lconvert)
36 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
37     set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
38 !!ELSE
39-    set(imported_location \"$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
40+    set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lconvert${OE_QMAKE_BIN_SUFFIX}\")
41 !!ENDIF
42     _qt5_LinguistTools_check_file_exists(${imported_location})
43
44