diff options
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanager.cpp')
-rw-r--r-- | src/plugins/cpptools/cppmodelmanager.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index 9ca78cabe4..e836fba590 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -465,14 +465,6 @@ CppModelManager *CppModelManager::instance() return m_instance; } -void CppModelManager::createCppModelManager(Internal::CppToolsPlugin *parent) -{ - QTC_ASSERT(!m_instance, return;); - m_instance = new CppModelManager(); - m_instance->initCppTools(); - m_instance->setParent(parent); -} - void CppModelManager::initCppTools() { // Objects @@ -512,6 +504,8 @@ CppModelManager::CppModelManager() : CppModelManagerBase(nullptr) , d(new CppModelManagerPrivate) { + m_instance = this; + // Used for weak dependency in VcsBaseSubmitEditor setObjectName("CppModelManager"); ExtensionSystem::PluginManager::addObject(this); @@ -562,6 +556,8 @@ CppModelManager::CppModelManager() initializeBuiltinModelManagerSupport(); d->m_internalIndexingSupport = new BuiltinIndexingSupport; + + initCppTools(); } CppModelManager::~CppModelManager() |