feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CppEditor: Switch on clangd by default

Browse Source 
Also change the corresponding settings key to force-enable it with
existing settings.

Fixes: QTCREATORBUG-22917
Change-Id: I3b5f54bf5d4261c6e4250245f44c4c360a911e5e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Christian Kandeler
2022-01-27 11:16:46 +01:00
parent 6993bc7382
commit 5c1dc40b6c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cppeditor/cppcodemodelsettings.cpp
View File

@@ -72,7 +72,7 @@ static QString indexerFileSizeLimitKey()
{ return QLatin1String(Constants::CPPEDITOR_INDEXER_FILE_SIZE_LIMIT); } { return QLatin1String(Constants::CPPEDITOR_INDEXER_FILE_SIZE_LIMIT); }
static QString clangdSettingsKey() { return QLatin1String("ClangdSettings"); } static QString clangdSettingsKey() { return QLatin1String("ClangdSettings"); }
static QString useClangdKey() { return QLatin1String("UseClangd"); } static QString useClangdKey() { return QLatin1String("UseClangdV7"); }
static QString clangdPathKey() { return QLatin1String("ClangdPath"); } static QString clangdPathKey() { return QLatin1String("ClangdPath"); }
static QString clangdIndexingKey() { return QLatin1String("ClangdIndexing"); } static QString clangdIndexingKey() { return QLatin1String("ClangdIndexing"); }
static QString clangdHeaderInsertionKey() { return QLatin1String("ClangdHeaderInsertion"); } static QString clangdHeaderInsertionKey() { return QLatin1String("ClangdHeaderInsertion"); }
@@ -485,7 +485,7 @@ QVariantMap ClangdSettings::Data::toMap() const
void ClangdSettings::Data::fromMap(const QVariantMap &map) void ClangdSettings::Data::fromMap(const QVariantMap &map)
{ {
useClangd = map.value(useClangdKey(), false).toBool(); useClangd = map.value(useClangdKey(), true).toBool();
executableFilePath = FilePath::fromString(map.value(clangdPathKey()).toString()); executableFilePath = FilePath::fromString(map.value(clangdPathKey()).toString());
enableIndexing = map.value(clangdIndexingKey(), true).toBool(); enableIndexing = map.value(clangdIndexingKey(), true).toBool();
autoIncludeHeaders = map.value(clangdHeaderInsertionKey(), false).toBool(); autoIncludeHeaders = map.value(clangdHeaderInsertionKey(), false).toBool();

2
src/plugins/cppeditor/cppcodemodelsettings.h
View File

@@ -122,7 +122,7 @@ public:
Utils::FilePath executableFilePath; Utils::FilePath executableFilePath;
QStringList sessionsWithOneClangd; QStringList sessionsWithOneClangd;
int workerThreadLimit = 0; int workerThreadLimit = 0;
bool useClangd = false; bool useClangd = true;
bool enableIndexing = true; bool enableIndexing = true;
bool autoIncludeHeaders = false; bool autoIncludeHeaders = false;
int documentUpdateThreshold = 500; int documentUpdateThreshold = 500;