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

Merge remote-tracking branch 'origin/10.0' into tr

Browse Source 
Conflicts:
	src/shared/qbs
	tests/system/suite_general/tst_opencreator_qbs/test.py

Change-Id: I683ebb489e7c2112b343bb3631f6343fdc84cc4a
This commit is contained in:
Eike Ziller
2023-06-15 09:43:24 +02:00
parent 95609551a1 b1e4ed3b7c
commit 68915713bf
6 changed files with 136 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/clangformat/clangformatindenter.cpp
View File

@@ -32,7 +32,7 @@ static bool isBeautifierPluginActivated()
return std::find_if(specs.begin(),
specs.end(),
[](ExtensionSystem::PluginSpec *spec) {
return spec->name() == "Beautifier";
return spec->name() == "Beautifier" && spec->isEffectivelyEnabled();
})
!= specs.end();
}

4
src/plugins/clangformat/llvmfilesystem.h
View File

@@ -50,7 +50,7 @@ public:
Q_UNUSED(RequiresNullTerminator);
Q_UNUSED(IsVolatile);
const FilePath path = FilePath::fromString(QString::fromStdString(Name.str()));
const FilePath path = FilePath::fromUserInput(QString::fromStdString(Name.str()));
const expected_str<QByteArray> contents = path.fileContents(FileSize, 0);
QTC_ASSERT_EXPECTED(contents, return std::error_code());
@@ -72,7 +72,7 @@ public:
ErrorOr<Status> status(const Twine &Path) override
{
const Utils::FilePath path = FilePath::fromString(QString::fromStdString(Path.str()));
const FilePath path = FilePath::fromUserInput(QString::fromStdString(Path.str()));
QFileInfo fInfo(QString::fromStdString(Path.str()));
if (!fInfo.exists())