From 3c96e840d879b882ffa7f74ded4c2fd0fca52834 Mon Sep 17 00:00:00 2001 From: mae <qt-info@nokia.com> Date: Mon, 5 Oct 2009 18:48:10 +0200 Subject: [PATCH] Fix (un)collapse all In combination with ifdef'ed out blocks (un)collapse all would possibly never expand the blocks again. --- src/plugins/texteditor/basetexteditor.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/texteditor/basetexteditor.h b/src/plugins/texteditor/basetexteditor.h index 17adcce1b13..0bfa24bfa23 100644 --- a/src/plugins/texteditor/basetexteditor.h +++ b/src/plugins/texteditor/basetexteditor.h @@ -133,9 +133,11 @@ public: TextBlockUserData *data = static_cast<TextBlockUserData*>(block.userData()); if (!data || data->collapseMode() != CollapseAfter) { data = static_cast<TextBlockUserData*>(block.next().userData()); - if (!data || data->collapseMode() != TextBlockUserData::CollapseThis || data->m_ifdefedOut) + if (!data || data->collapseMode() != TextBlockUserData::CollapseThis) data = 0; } + if (data && data->m_ifdefedOut) + data = 0; return data; } -- GitLab