diff options
| author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2020-12-14 14:05:03 +0200 |
|---|---|---|
| committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2020-12-14 14:07:49 +0200 |
| commit | 267f259c0dfbd348340d49e9a89b8684b994e22a (patch) | |
| tree | 643addb590f0914c7cac4aafd3c8c3a54359abe7 | |
| parent | eec9366f7dd60e522ab339d69a0052a57598829a (diff) | |
depends: Drop workaround for a fixed bug in Qt build system
The bug reports:
- https://bugreports.qt.io/browse/QTBUG-35444
- https://bugreports.qt.io/browse/QTBUG-32519
Fixed in Qt 5.3.0 (the workaround was introduced for Qt 5.2.1).
| -rw-r--r-- | depends/packages/qt.mk | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index fdf03e73fc..bf34835e1a 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -278,10 +278,7 @@ define $(package)_stage_cmds $(MAKE) -C src INSTALL_ROOT=$($(package)_staging_dir) $(addsuffix -install_subtargets,$(addprefix sub-,$($(package)_qt_libs))) && cd .. && \ $(MAKE) -C qttools/src/linguist/lrelease INSTALL_ROOT=$($(package)_staging_dir) install_target && \ $(MAKE) -C qttools/src/linguist/lupdate INSTALL_ROOT=$($(package)_staging_dir) install_target && \ - $(MAKE) -C qttranslations INSTALL_ROOT=$($(package)_staging_dir) install_subtargets && \ - if `test -f qtbase/src/plugins/platforms/xcb/xcb-static/libxcb-static.a`; then \ - cp qtbase/src/plugins/platforms/xcb/xcb-static/libxcb-static.a $($(package)_staging_prefix_dir)/lib; \ - fi + $(MAKE) -C qttranslations INSTALL_ROOT=$($(package)_staging_dir) install_subtargets endef define $(package)_postprocess_cmds |