diff options
| author | con <qtc-committer@nokia.com> | 2009-10-26 13:51:56 +0100 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2009-10-26 13:51:56 +0100 |
| commit | 441ece365aba579eeb66acb509df466f5029c580 (patch) | |
| tree | b4f8ac51e0203bad62c301f0c891b9246a15ad6a /src/plugins/cpptools/cppcodecompletion.cpp | |
| parent | 4504aec7deb2f0abcd6a71e094bbcfb4edd5154d (diff) | |
| parent | 3c0ca8c18881bc26fd8946bc2651fa89b10a1329 (diff) | |
| download | qt-creator-441ece365aba579eeb66acb509df466f5029c580.tar.gz | |
Merge commit 'origin/1.3'
Conflicts:
src/plugins/cpptools/cppcodecompletion.h
src/plugins/debugger/gdb/gdbengine.cpp
src/plugins/qmleditor/QmlEditor.pluginspec
Diffstat (limited to 'src/plugins/cpptools/cppcodecompletion.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppcodecompletion.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp index edaafcc890..5cea0c14c9 100644 --- a/src/plugins/cpptools/cppcodecompletion.cpp +++ b/src/plugins/cpptools/cppcodecompletion.cpp @@ -510,8 +510,11 @@ void CppQuickFixCollector::cleanup() CppCodeCompletion::CppCodeCompletion(CppModelManager *manager) : ICompletionCollector(manager), m_manager(manager), + m_editor(0), + m_startPosition(-1), m_caseSensitivity(Qt::CaseSensitive), m_autoInsertBrackets(true), + m_partialCompletionEnabled(true), m_forcedCompletion(false), m_completionOperator(T_EOF_SYMBOL), m_objcEnabled(true) |