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

Merge remote-tracking branch 'origin/3.3'

Browse Source 
Conflicts:
	src/plugins/debugger/watchhandler.cpp
	src/plugins/projectexplorer/kitmodel.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
	src/shared/qbs

Change-Id: I6a68090993a264e93ac7850858cc24ba6bdb5602
This commit is contained in:
Eike Ziller
2015-02-12 17:36:29 +01:00
parent 9926fc2ab1 28971701fd
commit 56aadc407d
44 changed files with 302 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/texteditor/generichighlighter/highlighter.cpp
View File

@@ -175,16 +175,17 @@ void Highlighter::highlightBlock(const QString &text)
handleContextChange(m_currentContext->lineBeginContext(),
m_currentContext->definition());
ProgressData progress;
ProgressData *progress = new ProgressData;
const int length = text.length();
while (progress.offset() < length)
iterateThroughRules(text, length, &progress, false, m_currentContext->rules());
while (progress->offset() < length)
iterateThroughRules(text, length, progress, false, m_currentContext->rules());
if (extractObservableState(currentBlockState()) != WillContinue) {
handleContextChange(m_currentContext->lineEndContext(),
m_currentContext->definition(),
false);
}
delete progress;
m_contexts.clear();
if (m_indentationBasedFolding) {