diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2021-06-28 14:55:54 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2021-06-30 15:09:56 +0000 |
commit | fbb804c442e34d669f7ce4e6a39aacd554ef8008 (patch) | |
tree | 73f5b5d4f1d2ae487e453c27e44de27c17c8a51d /src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp | |
parent | b3c83b79f70546c4ba16f41b30e32b5d163de71a (diff) |
Clangd: Add per-project settings
Users might want to use clangd for certain project, but not for others.
Change-Id: Id29ce3349f0acd359cf7c824ece073b147ed2280
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp')
-rw-r--r-- | src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp index 90ee657f6c..9af92352c3 100644 --- a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp +++ b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp @@ -285,7 +285,7 @@ F2TestCase::F2TestCase(CppEditorAction action, const QString curTestName = QLatin1String(QTest::currentTestFunction()); const QString tag = QLatin1String(QTest::currentDataTag()); - const bool useClangd = CppTools::ClangdSettings::useClangd(); + const bool useClangd = CppTools::ClangdSettings::instance().useClangd(); if (useClangd) { if (curTestName == "test_FollowSymbolUnderCursor_QObject_connect" || curTestName == "test_FollowSymbolUnderCursor_QObject_oldStyleConnect") { @@ -475,7 +475,7 @@ F2TestCase::F2TestCase(CppEditorAction action, // qDebug() << "Expected line:" << expectedLine; // qDebug() << "Expected column:" << expectedColumn; - if (!CppTools::ClangdSettings::useClangd()) { + if (!CppTools::ClangdSettings::instance().useClangd()) { QEXPECT_FAIL("globalVarFromEnum", "Contributor works on a fix.", Abort); QEXPECT_FAIL("matchFunctionSignature_Follow_5", "foo(int) resolved as CallAST", Abort); } @@ -545,7 +545,7 @@ void CppEditorPlugin::initTestCase() if (clangdFromEnv.isEmpty()) return; ClangdSettings::setClangdFilePath(Utils::FilePath::fromString(clangdFromEnv)); - const auto clangd = ClangdSettings::clangdFilePath(); + const auto clangd = ClangdSettings::instance().clangdFilePath(); if (clangd.isEmpty() || !clangd.exists()) return; |