Merge branch 'SaisieJolieMerge10Apr' into SaisieJolieMerge11Apr (master)

Change-Id: I06732115ee37ffd9a037a8412e1c57751dfb3e0f
This commit is contained in:
Léa Saviot
2018-04-11 17:18:00 +02:00
216 changed files with 7366 additions and 1537 deletions

View File

@@ -77,7 +77,7 @@ void VariableBoxLeafCell::setSubtitle(const char * text) {
}
void VariableBoxLeafCell::setExpressionLayout(ExpressionLayout * expressionLayout) {
m_expressionView.setExpression(expressionLayout);
m_expressionView.setExpressionLayout(expressionLayout);
}
void VariableBoxLeafCell::drawRect(KDContext * ctx, KDRect rect) const {