diff options
| author | Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> | 2015-05-08 15:48:17 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> | 2015-06-10 10:15:40 +0000 |
| commit | 23b8a3b2e83e46e9ca8b1e7e314fad7030b23ff4 (patch) | |
| tree | bf30a066c35c2df4385ff3cd08a9b683e216269b /src/plugins/cpptools/cpptoolsplugin.cpp | |
| parent | 264132da27ce9a11ca102ce7efaae13b9baaab6b (diff) | |
| download | qt-creator-23b8a3b2e83e46e9ca8b1e7e314fad7030b23ff4.tar.gz | |
Clang: Use completion through backend process
This makes us independent of libclang crashes for completion.
Re-parsing for highlighting still happens in the Qt Creator process.
Run in verbose mode:
qtc.clangcodemodel.ipc=true
Run tests:
-test "ClangCodeModel"
Task-number: QTCREATORBUG-14108
Task-number: QTCREATORBUG-12819
Change-Id: Id3e95bd2afdb6508bbd1d35fddc69534a909b905
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
Diffstat (limited to 'src/plugins/cpptools/cpptoolsplugin.cpp')
| -rw-r--r-- | src/plugins/cpptools/cpptoolsplugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp index 4c79948d9f..c125492950 100644 --- a/src/plugins/cpptools/cpptoolsplugin.cpp +++ b/src/plugins/cpptools/cpptoolsplugin.cpp @@ -136,7 +136,6 @@ const QStringList &CppToolsPlugin::sourcePrefixes() return m_instance->m_fileSettings->sourcePrefixes; } - bool CppToolsPlugin::initialize(const QStringList &arguments, QString *error) { Q_UNUSED(arguments) @@ -153,6 +152,8 @@ bool CppToolsPlugin::initialize(const QStringList &arguments, QString *error) modelManager->updateSourceFiles(files.toSet()); }); + m_codeModelSettings->fromSettings(ICore::settings()); + JsExpander::registerQObjectForJs(QLatin1String("Cpp"), new CppToolsJsExtension); CppLocatorData *locatorData = new CppLocatorData; @@ -218,7 +219,6 @@ void CppToolsPlugin::extensionsInitialized() m_fileSettings->fromSettings(ICore::settings()); if (!m_fileSettings->applySuffixesToMimeDB()) qWarning("Unable to apply cpp suffixes to mime database (cpp mime types not found).\n"); - m_codeModelSettings->fromSettings(ICore::settings()); } ExtensionSystem::IPlugin::ShutdownFlag CppToolsPlugin::aboutToShutdown() |