Merge remote-tracking branch 'origin/10.0'

Conflicts:
	src/plugins/debugger/watchhandler.cpp

Change-Id: If759b6260dfa008738d3a0ce543eb0eead8a8bba
This commit is contained in:
Eike Ziller
2023-02-27 09:48:12 +01:00
73 changed files with 1388 additions and 407 deletions

View File

@@ -1878,7 +1878,7 @@ expected_str<FilePath> FilePath::localSource() const
return *this;
QTC_ASSERT(s_deviceHooks.localSource,
return make_unexpected(Tr::tr("No 'localSource' device hook set.")));
return make_unexpected(Tr::tr("No \"localSource\" device hook set.")));
return s_deviceHooks.localSource(*this);
}