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

Merge remote-tracking branch 'origin/12.0'

Browse Source 
Conflicts:
	src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp

Change-Id: I7a2cfa35b5bc9070c66561bfba3e4b5a8e26917f
This commit is contained in:
Eike Ziller
2024-01-19 09:33:04 +01:00
parent 491b24de70 5e6f1f5dac
commit 4936a89f16
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
View File

@@ -275,8 +275,7 @@ static QString newFilesForFunction(const std::string &cmakeFunction,
static std::optional<Link> cmakeFileForBuildKey(const QString &buildKey, static std::optional<Link> cmakeFileForBuildKey(const QString &buildKey,
const QList<CMakeBuildTarget> &targets) const QList<CMakeBuildTarget> &targets)
{ {
auto target = Utils::findOrDefault(targets, auto target = Utils::findOrDefault(targets, [buildKey](const CMakeBuildTarget &target) {
[buildKey](const CMakeBuildTarget &target) {
return target.title == buildKey; return target.title == buildKey;
}); });
if (target.backtrace.isEmpty()) { if (target.backtrace.isEmpty()) {
@@ -658,7 +657,7 @@ bool CMakeBuildSystem::addSrcFiles(Node *context, const FilePaths &filePaths, Fi
return false; return false;
} }
const std::string target_name = targetName.toStdString(); const std::string target_name = function->Arguments().front().Value;
auto qtAddModule = [target_name](const auto &func) { auto qtAddModule = [target_name](const auto &func) {
return (func.LowerCaseName() == "qt_add_qml_module" return (func.LowerCaseName() == "qt_add_qml_module"
|| func.LowerCaseName() == "qt6_add_qml_module") || func.LowerCaseName() == "qt6_add_qml_module")

2
src/plugins/cppeditor/cppfunctiondecldeflink.cpp
View File

@@ -863,6 +863,8 @@ ChangeSet FunctionDeclDefLink::changes(const Snapshot &snapshot, int targetOffse
const QStringView docView = QStringView(content); const QStringView docView = QStringView(content);
for (auto it = renamedTargetParameters.cbegin(); for (auto it = renamedTargetParameters.cbegin();
it != renamedTargetParameters.cend(); ++it) { it != renamedTargetParameters.cend(); ++it) {
if (!it.key()->name())
continue;
const QString paramName = Overview().prettyName(it.key()->name()); const QString paramName = Overview().prettyName(it.key()->name());
for (const Token &tok : functionComments) { for (const Token &tok : functionComments) {
const TranslationUnit * const tu = targetFile->cppDocument()->translationUnit(); const TranslationUnit * const tu = targetFile->cppDocument()->translationUnit();