-
Notifications
You must be signed in to change notification settings - Fork 174
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Remove drop_lrelease_dependency.patch"
This reverts commit 3b6c56c.
- Loading branch information
1 parent
d71b175
commit bc48e30
Showing
3 changed files
with
24 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
commit 67b3ed7406e1d0762188dbad2c44a06824ba0778 | ||
Author: fanquake <[email protected]> | ||
Date: Tue Aug 18 15:24:01 2020 +0800 | ||
|
||
Drop dependency on lrelease | ||
|
||
Qts buildsystem insists on using the installed lrelease, but gets | ||
confused about how to find it. Since we manually control the build | ||
order, just drop the dependency. | ||
|
||
See #9469 | ||
|
||
diff --git a/qttranslations/translations/translations.pro b/qttranslations/translations/translations.pro | ||
index 694544c..eff339d 100644 | ||
--- a/qttranslations/translations/translations.pro | ||
+++ b/qttranslations/translations/translations.pro | ||
@@ -107,3 +107,2 @@ updateqm.commands = $$LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT} | ||
silent:updateqm.commands = @echo lrelease ${QMAKE_FILE_IN} && $$updateqm.commands | ||
-updateqm.depends = $$LRELEASE_EXE | ||
updateqm.name = LRELEASE ${QMAKE_FILE_IN} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters