From c8cf35eb83c9dab1fb2a0b24be5a8c625b053dda Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 31 Jan 2019 18:22:44 +0000 Subject: [PATCH] Don't disable itemview wordwarp workaround for QTBUG-14949 in 5.11 * It doesn't seem to be fixed. --- .../Styles/RDTweakedNativeStyle/RDTweakedNativeStyle.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/qrenderdoc/Styles/RDTweakedNativeStyle/RDTweakedNativeStyle.cpp b/qrenderdoc/Styles/RDTweakedNativeStyle/RDTweakedNativeStyle.cpp index c20609d4f..720c9acbd 100644 --- a/qrenderdoc/Styles/RDTweakedNativeStyle/RDTweakedNativeStyle.cpp +++ b/qrenderdoc/Styles/RDTweakedNativeStyle/RDTweakedNativeStyle.cpp @@ -394,7 +394,9 @@ void RDTweakedNativeStyle::drawControl(ControlElement control, const QStyleOptio // work around itemview rendering bug - the first line in a multi-line text that is elided stops // all subsequent text from rendering. Should be fixed in 5.11, but for all other versions we need // to manually step in. We manually elide the text before calling down to the style -#if(QT_VERSION < QT_VERSION_CHECK(5, 11, 0)) +// +// However in 5.11.1 at least on macOS it still seems to be broken +#if 1 //(QT_VERSION < QT_VERSION_CHECK(5, 11, 0)) if(control == QStyle::CE_ItemViewItem) { const QStyleOptionViewItem *viewopt = qstyleoption_cast(opt);