summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cppcodecompletion.cpp
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>2010-07-15 16:05:43 +0200
committerThorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>2010-07-15 16:24:01 +0200
commite101d8eccc24b9bdbe102716cf63e01ecd9efca3 (patch)
treec77c34efd74c3dd66d297514ae7725db0593a5f3 /src/plugins/cpptools/cppcodecompletion.cpp
parent2c51e0c9da9074a0ee7e9ce4666a777f7a03affd (diff)
downloadqt-creator-e101d8eccc24b9bdbe102716cf63e01ecd9efca3.tar.gz
Make the way completion is triggered configurable
Now it's possible to choose between having completion popup manually, when triggered or always.
Diffstat (limited to 'src/plugins/cpptools/cppcodecompletion.cpp')
-rw-r--r--src/plugins/cpptools/cppcodecompletion.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp
index d3e46ea06c..993aef82e0 100644
--- a/src/plugins/cpptools/cppcodecompletion.cpp
+++ b/src/plugins/cpptools/cppcodecompletion.cpp
@@ -655,7 +655,7 @@ bool CppCodeCompletion::triggersCompletion(TextEditor::ITextEditable *editor)
}
return true;
- } else {
+ } else if (completionSettings().m_completionTrigger == TextEditor::AutomaticCompletion) {
// Trigger completion after at least three characters of a name have been typed
const int startOfName = findStartOfName(pos);
if (pos - startOfName > 2) {