From 3497f037ccadd1b69d25d3b703a735a1094e5bf7 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@digia.com>
Date: Fri, 3 May 2013 16:50:12 +0200
Subject: [PATCH] Fix crash for long properties in outline model
Make sure the outline model only shows the first line
of a long property value.
Change-Id: Iac8059e927b10c400afec285a6dc6485cbbf49b4
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
---
src/plugins/qmljseditor/qmloutlinemodel.cpp | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/plugins/qmljseditor/qmloutlinemodel.cpp b/src/plugins/qmljseditor/qmloutlinemodel.cpp
index 0dab481dfbe..9e55cbd5af2 100644
--- a/src/plugins/qmljseditor/qmloutlinemodel.cpp
+++ b/src/plugins/qmljseditor/qmloutlinemodel.cpp
@@ -963,8 +963,11 @@ QString QmlOutlineModel::getAnnotation(AST::ExpressionNode *expression)
if (!expression)
return QString();
QString source = m_semanticInfo.document->source();
- return source.mid(expression->firstSourceLocation().begin(),
- expression->lastSourceLocation().end() - expression->firstSourceLocation().begin());
+ QString str = source.mid(expression->firstSourceLocation().begin(),
+ expression->lastSourceLocation().end()
+ - expression->firstSourceLocation().begin());
+ // only show first line
+ return str.left(str.indexOf(QLatin1Char('\n')));
}
QHash<QString,QString> QmlOutlineModel::getScriptBindings(AST::UiObjectInitializer *objectInitializer) {
--
GitLab