Skip to content

Commit fa43e3e

Browse files
committed
Patch out qrhi
1 parent 1cf2f36 commit fa43e3e

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

depends/packages/qt.mk

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ $(package)_patches=fix_qt_pkgconfig.patch mac-qmake.conf fix_no_printer.patch no
1010
$(package)_patches += dont_hardcode_x86_64.patch fix_montery_include.patch
1111
$(package)_patches += fix_android_jni_static.patch dont_hardcode_pwd.patch
1212
$(package)_patches += qtbase-moc-ignore-gcc-macro.patch fix_limits_header.patch
13-
$(package)_patches += fix_bigsur_style.patch subdirs.pro
13+
$(package)_patches += fix_bigsur_style.patch no_qrhi.patch drop_lrelease_dependency.patch subdirs.pro
1414

1515
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
1616
$(package)_qttranslations_sha256_hash=d5788e86257b21d5323f1efd94376a213e091d1e5e03b45a95dd052b5f570db8
@@ -257,6 +257,7 @@ define $(package)_preprocess_cmds
257257
patch -p1 -i $($(package)_patch_dir)/fix_limits_header.patch && \
258258
patch -p1 -i $($(package)_patch_dir)/fix_montery_include.patch && \
259259
patch -p1 -i $($(package)_patch_dir)/fix_bigsur_style.patch && \
260+
patch -p1 -i $($(package)_patch_dir)/no_qrhi.patch && \
260261
cp $($(package)_patch_dir)/subdirs.pro subdirs.pro && \
261262
sed -i.old "s|updateqm.commands = \$$$$\$$$$LRELEASE|updateqm.commands = $($(package)_extract_dir)/qttools/bin/lrelease|" qttranslations/translations/translations.pro && \
262263
mkdir -p qtbase/mkspecs/macx-clang-linux &&\

depends/patches/qt/no_qrhi.patch

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
This can be removed when QT6 is introduced.
2+
3+
--- a/qtbase/src/gui/gui.pro
4+
+++ b/qtbase/src/gui/gui.pro
5+
@@ -49,7 +49,6 @@
6+
include(itemmodels/itemmodels.pri)
7+
include(vulkan/vulkan.pri)
8+
include(platform/platform.pri)
9+
-include(rhi/rhi.pri)
10+
11+
QMAKE_LIBS += $$QMAKE_LIBS_GUI

0 commit comments

Comments
 (0)