fix(qt): patch qt to make placeholders differ from actual text

Using a part of this patch https://bugreports.qt.io/browse/QTBUG-92199?focusedId=669719&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-669719
This commit is contained in:
UdjinM6 2023-09-30 21:57:03 +03:00
parent 09800cff8f
commit 139d70701c
No known key found for this signature in database
GPG Key ID: 83592BD1400D58D9
2 changed files with 12 additions and 0 deletions

View File

@ -11,6 +11,7 @@ $(package)_patches = qt.pro
$(package)_patches += qttools_src.pro $(package)_patches += qttools_src.pro
$(package)_patches += mac-qmake.conf $(package)_patches += mac-qmake.conf
$(package)_patches += fix_qt_pkgconfig.patch $(package)_patches += fix_qt_pkgconfig.patch
$(package)_patches += fix_qt_placeholders.patch
$(package)_patches += no-xlib.patch $(package)_patches += no-xlib.patch
$(package)_patches += dont_hardcode_x86_64.patch $(package)_patches += dont_hardcode_x86_64.patch
$(package)_patches += fix_montery_include.patch $(package)_patches += fix_montery_include.patch
@ -245,6 +246,7 @@ define $(package)_preprocess_cmds
cp $($(package)_patch_dir)/qttools_src.pro qttools/src/src.pro && \ cp $($(package)_patch_dir)/qttools_src.pro qttools/src/src.pro && \
patch -p1 -i $($(package)_patch_dir)/dont_hardcode_pwd.patch && \ patch -p1 -i $($(package)_patch_dir)/dont_hardcode_pwd.patch && \
patch -p1 -i $($(package)_patch_dir)/fix_qt_pkgconfig.patch && \ patch -p1 -i $($(package)_patch_dir)/fix_qt_pkgconfig.patch && \
patch -p1 -i $($(package)_patch_dir)/fix_qt_placeholders.patch && \
patch -p1 -i $($(package)_patch_dir)/fix_android_jni_static.patch && \ patch -p1 -i $($(package)_patch_dir)/fix_android_jni_static.patch && \
patch -p1 -i $($(package)_patch_dir)/no-xlib.patch && \ patch -p1 -i $($(package)_patch_dir)/no-xlib.patch && \
patch -p1 -i $($(package)_patch_dir)/dont_hardcode_x86_64.patch && \ patch -p1 -i $($(package)_patch_dir)/dont_hardcode_x86_64.patch && \

View File

@ -0,0 +1,10 @@
--- old/qtbase/src/widgets/styles/qstylesheetstyle.cpp
+++ new/qtbase/src/widgets/styles/qstylesheetstyle.cpp
@@ -1465,7 +1465,6 @@ void QRenderRule::configurePalette(QPalette *p, QPalette::ColorGroup cg, const Q
p->setBrush(cg, w->foregroundRole(), pal->foreground);
p->setBrush(cg, QPalette::WindowText, pal->foreground);
p->setBrush(cg, QPalette::Text, pal->foreground);
- p->setBrush(cg, QPalette::PlaceholderText, pal->foreground);
}
if (pal->selectionBackground.style() != Qt::NoBrush)
p->setBrush(cg, QPalette::Highlight, pal->selectionBackground);