File tree Expand file tree Collapse file tree 2 files changed +22
-2
lines changed Expand file tree Collapse file tree 2 files changed +22
-2
lines changed Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ $(package)_qt_libs=corelib network widgets gui plugins testlib
11
11
$(package)_patches =fix_qt_pkgconfig.patch mac-qmake.conf fix_configure_mac.patch fix_no_printer.patch
12
12
$(package)_patches+ = fix_rcc_determinism.patch fix_riscv64_arch.patch xkb-default.patch no-xlib.patch
13
13
$(package)_patches+ = fix_android_qmake_conf.patch fix_android_jni_static.patch dont_hardcode_pwd.patch
14
- $(package)_patches+ = freetype_back_compat.patch
14
+ $(package)_patches+ = freetype_back_compat.patch drop_lrelease_dependency.patch
15
15
16
16
# Update OSX_QT_TRANSLATIONS when this is updated
17
17
$(package)_qttranslations_file_name =qttranslations-$($(package ) _suffix)
@@ -195,7 +195,7 @@ endef
195
195
define $(package)_preprocess_cmds
196
196
patch -p1 -i $($(package ) _patch_dir) /freetype_back_compat.patch && \
197
197
sed -i.old "s|updateqm.commands = \$$$$\$$$$LRELEASE|updateqm.commands = $($(package ) _extract_dir) /qttools/bin/lrelease|" qttranslations/translations/translations.pro && \
198
- sed -i.old "/updateqm.depends =/d" qttranslations/translations/translations.pro && \
198
+ patch -p1 -i $( $( package ) _patch_dir) /drop_lrelease_dependency.patch && \
199
199
patch -p1 -i $($(package ) _patch_dir) /dont_hardcode_pwd.patch &&\
200
200
mkdir -p qtbase/mkspecs/macx-clang-linux &&\
201
201
cp -f qtbase/mkspecs/macx-clang/Info.plist.lib qtbase/mkspecs/macx-clang-linux/ &&\
Original file line number Diff line number Diff line change
1
+ commit 67b3ed7406e1d0762188dbad2c44a06824ba0778
2
+ Author: fanquake <
[email protected] >
3
+ Date: Tue Aug 18 15:24:01 2020 +0800
4
+
5
+ Drop dependency on lrelease
6
+
7
+ Qts buildsystem insists on using the installed lrelease, but gets
8
+ confused about how to find it. Since we manually control the build
9
+ order, just drop the dependency.
10
+
11
+ See #9469
12
+
13
+ diff --git a/qttranslations/translations/translations.pro b/qttranslations/translations/translations.pro
14
+ index 694544c..eff339d 100644
15
+ --- a/qttranslations/translations/translations.pro
16
+ +++ b/qttranslations/translations/translations.pro
17
+ @@ -109,3 +109,2 @@ updateqm.commands = $$LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT}
18
+ silent:updateqm.commands = @echo lrelease ${QMAKE_FILE_IN} && $$updateqm.commands
19
+ - updateqm.depends = $$LRELEASE_EXE
20
+ updateqm.name = LRELEASE ${QMAKE_FILE_IN}
You can’t perform that action at this time.
0 commit comments