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

Merge remote-tracking branch 'origin/2.8'

Browse Source 
Conflicts:
	src/libs/extensionsystem/pluginmanager.cpp
	src/libs/extensionsystem/pluginspec.cpp
	src/plugins/coreplugin/basefilewizard.cpp
	src/plugins/coreplugin/coreplugin.pro
	src/plugins/coreplugin/coreplugin.qbs
	src/plugins/coreplugin/editormanager/ieditor.cpp
	src/plugins/coreplugin/externaltool.cpp
	src/plugins/coreplugin/icore.cpp
	src/plugins/cpptools/cppmodelmanager.cpp
	src/plugins/fakevim/fakevimhandler.cpp
	src/plugins/find/ifindfilter.cpp
	src/plugins/projectexplorer/buildstep.cpp
	src/plugins/projectexplorer/devicesupport/idevice.cpp
	src/plugins/projectexplorer/runconfiguration.cpp
	src/plugins/vcsbase/vcsbaseeditor.cpp
	tests/system/suite_debugger/tst_simple_analyze/test.py

Change-Id: I11dc9e60bfc14bad4f8af747d041fc7678a07c17
This commit is contained in:
Eike Ziller
2013-09-27 10:44:32 +02:00
parent 19c735a491 a12a9f491c
commit 63ff745213
133 changed files with 1386 additions and 1326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/texteditor/syntaxhighlighter.cpp
View File

@@ -342,7 +342,7 @@ SyntaxHighlighter::SyntaxHighlighter(BaseTextDocument *parent)
}
/*!
Constructs a SyntaxHighlighter and installs it on \a parent 's
Constructs a SyntaxHighlighter and installs it on \a parent's
QTextDocument. The specified QTextEdit also becomes the owner of
the SyntaxHighlighter.
*/
@@ -354,7 +354,7 @@ SyntaxHighlighter::SyntaxHighlighter(QTextEdit *parent)
}
/*!
Destructor. Uninstalls this syntax highlighter from the text document.
Destructor that uninstalls this syntax highlighter from the text document.
*/
SyntaxHighlighter::~SyntaxHighlighter()
{