diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-09-27 10:44:32 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-09-27 10:44:32 +0200 |
| commit | 63ff7452137958215988d9f2f6066de955500be0 (patch) | |
| tree | d645a26ae9db68cdbf37e9fd997a221c81eea008 /src/plugins/texteditor/syntaxhighlighter.cpp | |
| parent | 19c735a4912487e8038f08ea0b617ccce62cd1a3 (diff) | |
| parent | a12a9f491cb31ff5c22f1051bb22ccfef6c65217 (diff) | |
Merge remote-tracking branch 'origin/2.8'
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
Diffstat (limited to 'src/plugins/texteditor/syntaxhighlighter.cpp')
| -rw-r--r-- | src/plugins/texteditor/syntaxhighlighter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/texteditor/syntaxhighlighter.cpp b/src/plugins/texteditor/syntaxhighlighter.cpp index f2483f9e58c..1cf9359c372 100644 --- a/src/plugins/texteditor/syntaxhighlighter.cpp +++ b/src/plugins/texteditor/syntaxhighlighter.cpp @@ -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() { |