Skip to content

Commit 139d707

Browse files

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

depends/packages/qt.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ $(package)_patches = qt.pro
1111
$(package)_patches += qttools_src.pro
1212
$(package)_patches += mac-qmake.conf
1313
$(package)_patches += fix_qt_pkgconfig.patch
14+
$(package)_patches += fix_qt_placeholders.patch
1415
$(package)_patches += no-xlib.patch
1516
$(package)_patches += dont_hardcode_x86_64.patch
1617
$(package)_patches += fix_montery_include.patch
@@ -245,6 +246,7 @@ define $(package)_preprocess_cmds
245246
cp $($(package)_patch_dir)/qttools_src.pro qttools/src/src.pro && \
246247
patch -p1 -i $($(package)_patch_dir)/dont_hardcode_pwd.patch && \
247248
patch -p1 -i $($(package)_patch_dir)/fix_qt_pkgconfig.patch && \
249+
patch -p1 -i $($(package)_patch_dir)/fix_qt_placeholders.patch && \
248250
patch -p1 -i $($(package)_patch_dir)/fix_android_jni_static.patch && \
249251
patch -p1 -i $($(package)_patch_dir)/no-xlib.patch && \
250252
patch -p1 -i $($(package)_patch_dir)/dont_hardcode_x86_64.patch && \
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--- old/qtbase/src/widgets/styles/qstylesheetstyle.cpp
2+
+++ new/qtbase/src/widgets/styles/qstylesheetstyle.cpp
3+
@@ -1465,7 +1465,6 @@ void QRenderRule::configurePalette(QPalette *p, QPalette::ColorGroup cg, const Q
4+
p->setBrush(cg, w->foregroundRole(), pal->foreground);
5+
p->setBrush(cg, QPalette::WindowText, pal->foreground);
6+
p->setBrush(cg, QPalette::Text, pal->foreground);
7+
- p->setBrush(cg, QPalette::PlaceholderText, pal->foreground);
8+
}
9+
if (pal->selectionBackground.style() != Qt::NoBrush)
10+
p->setBrush(cg, QPalette::Highlight, pal->selectionBackground);

0 commit comments

Comments
 (0)