forked from qt-creator/qt-creator
Merge commit 'origin/1.3'
Conflicts: src/plugins/cpptools/cppcodecompletion.h src/plugins/debugger/gdb/gdbengine.cpp src/plugins/qmleditor/QmlEditor.pluginspec
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user