From c294b47487804f204f2d235ae0d0491e8117995e Mon Sep 17 00:00:00 2001 From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com> Date: Sun, 17 Nov 2024 07:38:23 +0000 Subject: [PATCH] revert: patch qt to make placeholders differ from actual text reverts: - 139d70701cfe4b015fda1fb5acf329ace127567f --- depends/packages/qt.mk | 2 -- depends/patches/qt/fix_qt_placeholders.patch | 10 ---------- 2 files changed, 12 deletions(-) delete mode 100644 depends/patches/qt/fix_qt_placeholders.patch diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 6f00cd3559..f32b538633 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -11,7 +11,6 @@ $(package)_patches = qt.pro $(package)_patches += qttools_src.pro $(package)_patches += mac-qmake.conf $(package)_patches += fix_qt_pkgconfig.patch -$(package)_patches += fix_qt_placeholders.patch $(package)_patches += no-xlib.patch $(package)_patches += fix_android_jni_static.patch $(package)_patches += dont_hardcode_pwd.patch @@ -239,7 +238,6 @@ define $(package)_preprocess_cmds patch -p1 -i $($(package)_patch_dir)/fix-macos-linker.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_placeholders.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)/qtbase-moc-ignore-gcc-macro.patch && \ diff --git a/depends/patches/qt/fix_qt_placeholders.patch b/depends/patches/qt/fix_qt_placeholders.patch deleted file mode 100644 index 79131ae22a..0000000000 --- a/depends/patches/qt/fix_qt_placeholders.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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);