Commit 7bf0ff8d authored by Christian Kamm's avatar Christian Kamm
Browse files

Merge branch '2.0'

Conflicts:
	src/plugins/qmljseditor/qmljshighlighter.cpp
parents 70448b01 983ed48a
......@@ -326,7 +326,7 @@ int Highlighter::onBlockStart()
int previousState = previousBlockState();
if (previousState != -1) {
state = previousState & 0xff;
m_braceDepth = previousState >> 8;
m_braceDepth = (previousState >> 8);
m_inMultilineComment = (state == Scanner::MultiLineComment);
}
m_foldingIndent = m_braceDepth;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment