feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge branch '2.0'

Browse Source 
Conflicts:
	src/plugins/qmljseditor/qmljshighlighter.cpp
This commit is contained in:
Christian Kamm
2010-06-15 14:37:46 +02:00
parent 70448b016d 983ed48ae3
commit 7bf0ff8dc2
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmljseditor/qmljshighlighter.cpp
View File

@@ -326,7 +326,7 @@ int Highlighter::onBlockStart()
int previousState = previousBlockState(); int previousState = previousBlockState();
if (previousState != -1) { if (previousState != -1) {
state = previousState & 0xff; state = previousState & 0xff;
m_braceDepth = previousState >> 8; m_braceDepth = (previousState >> 8);
m_inMultilineComment = (state == Scanner::MultiLineComment); m_inMultilineComment = (state == Scanner::MultiLineComment);
} }
m_foldingIndent = m_braceDepth; m_foldingIndent = m_braceDepth;