diff options
| author | Roberto Raggi <roberto.raggi@nokia.com> | 2010-11-26 10:59:33 +0100 |
|---|---|---|
| committer | Roberto Raggi <roberto.raggi@nokia.com> | 2010-11-26 11:00:21 +0100 |
| commit | a794154dd766d6be56f164178b35ed50643ca1cd (patch) | |
| tree | 5a6545706427fa130ea1d7d52a9a39d666455391 /src/plugins/glsleditor/glsleditor.cpp | |
| parent | 20b58e4e6e1fbf1aa22fd597d33d6c7bca52fe45 (diff) | |
| download | qt-creator-a794154dd766d6be56f164178b35ed50643ca1cd.tar.gz | |
Added indenter, code folding and automagically brace insertion to the GLSL editor.
Diffstat (limited to 'src/plugins/glsleditor/glsleditor.cpp')
| -rw-r--r-- | src/plugins/glsleditor/glsleditor.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/glsleditor/glsleditor.cpp b/src/plugins/glsleditor/glsleditor.cpp index f256ee50fb..a420c1ce48 100644 --- a/src/plugins/glsleditor/glsleditor.cpp +++ b/src/plugins/glsleditor/glsleditor.cpp @@ -32,6 +32,8 @@ #include "glsleditorconstants.h" #include "glsleditorplugin.h" #include "glslhighlighter.h" +#include "glslautocompleter.h" +#include "glslindenter.h" #include <glsl/glsllexer.h> #include <glsl/glslparser.h> @@ -85,7 +87,8 @@ GLSLTextEditor::GLSLTextEditor(QWidget *parent) : setParenthesesMatchingEnabled(true); setMarksVisible(true); setCodeFoldingSupported(true); - //setIndenter(new Indenter); + setIndenter(new GLSLIndenter()); + setAutoCompleter(new GLSLCompleter()); m_updateDocumentTimer = new QTimer(this); m_updateDocumentTimer->setInterval(UPDATE_DOCUMENT_DEFAULT_INTERVAL); |