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 
Change-Id: Iee11f97dbd0114957e856d02f0ad295813a05431
This commit is contained in:
Eike Ziller
2023-12-20 16:05:55 +01:00
parent 90368e2bba bbf02473e0
commit 7443ca977b
5 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coin/instructions/common_environment.yaml
View File

@@ -13,7 +13,7 @@ instructions:
variableValue: "https://ci-files02-hki.ci.qt.io/packages/jenkins/archive/qt/6.6/6.6.0-released/Qt" variableValue: "https://ci-files02-hki.ci.qt.io/packages/jenkins/archive/qt/6.6/6.6.0-released/Qt"
- type: EnvironmentVariable - type: EnvironmentVariable
variableName: QTC_QT_MODULES variableName: QTC_QT_MODULES
variableValue: "qt5compat qtbase qtdeclarative qtimageformats qtquick3d qtquickcontrols2 qtquicktimeline qtserialport qtshadertools qtsvg qttools qttranslations qtwebengine" variableValue: "qt5compat qtbase qtdeclarative qtimageformats qtquick3d qtquicktimeline qtserialport qtshadertools qtsvg qttools qttranslations qtwebengine"
- type: EnvironmentVariable - type: EnvironmentVariable
variableName: MACOSX_DEPLOYMENT_TARGET variableName: MACOSX_DEPLOYMENT_TARGET
variableValue: 10.15 variableValue: 10.15

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

@@ -1909,7 +1909,9 @@ CMakeBuildConfiguration *CMakeBuildSystem::cmakeBuildConfiguration() const
static FilePaths librarySearchPaths(const CMakeBuildSystem *bs, const QString &buildKey) static FilePaths librarySearchPaths(const CMakeBuildSystem *bs, const QString &buildKey)
{ {
const CMakeBuildTarget cmakeBuildTarget const CMakeBuildTarget cmakeBuildTarget
= Utils::findOrDefault(bs->buildTargets(), Utils::equal(&CMakeBuildTarget::title, buildKey)); = Utils::findOrDefault(bs->buildTargets(), [buildKey](const auto &target) {
return target.title == buildKey && target.targetType != UtilityType;
});
return cmakeBuildTarget.libraryDirectories; return cmakeBuildTarget.libraryDirectories;
} }

19
src/plugins/cmakeprojectmanager/cmakelocatorfilter.cpp
View File

@@ -48,10 +48,6 @@ static LocatorMatcherTasks cmakeMatchers(const BuildAcceptor &acceptor)
continue; continue;
const int index = target.title.indexOf(input, 0, Qt::CaseInsensitive); const int index = target.title.indexOf(input, 0, Qt::CaseInsensitive);
if (index >= 0) { if (index >= 0) {
const FilePath path = target.backtrace.isEmpty()
? cmakeProject->projectFilePath()
: target.backtrace.last().path;
const int line = target.backtrace.isEmpty() ? 0 : target.backtrace.last().line;
const FilePath projectPath = cmakeProject->projectFilePath(); const FilePath projectPath = cmakeProject->projectFilePath();
const QString displayName = target.title; const QString displayName = target.title;
LocatorFilterEntry entry; LocatorFilterEntry entry;
@@ -62,11 +58,20 @@ static LocatorMatcherTasks cmakeMatchers(const BuildAcceptor &acceptor)
return AcceptResult(); return AcceptResult();
}; };
} }
entry.linkForEditor = {path, line}; bool realTarget = false;
entry.extraInfo = path.shortNativePath(); if (!target.backtrace.isEmpty() && target.targetType != UtilityType) {
const FilePath path = target.backtrace.last().path;
const int line = target.backtrace.last().line;
entry.linkForEditor = {path, line};
entry.extraInfo = path.shortNativePath();
realTarget = true;
} else {
entry.extraInfo = projectPath.shortNativePath();
}
entry.highlightInfo = {index, int(input.length())}; entry.highlightInfo = {index, int(input.length())};
entry.filePath = cmakeProject->projectFilePath(); entry.filePath = cmakeProject->projectFilePath();
entries.append(entry); if (acceptor || realTarget)
entries.append(entry);
} }
} }
} }

2
src/plugins/projectexplorer/projectnodes.cpp
View File

@@ -348,7 +348,7 @@ FilePath Node::pathOrDirectory(bool dir) const
QTC_CHECK(!location.needsDevice()); QTC_CHECK(!location.needsDevice());
QFileInfo fi = location.toFileInfo(); QFileInfo fi = location.toFileInfo();
while ((!fi.exists() || !fi.isDir()) && !fi.isRoot()) while ((!fi.exists() || !fi.isDir()) && !fi.isRoot() && (fi.fileName() != fi.absolutePath()))
fi.setFile(fi.absolutePath()); fi.setFile(fi.absolutePath());
return FilePath::fromString(fi.absoluteFilePath()); return FilePath::fromString(fi.absoluteFilePath());
} }

2
tests/manual/debugger/simple/simple_test_app.cpp
View File

@@ -3984,7 +3984,7 @@ namespace qstring {
// Check string "HiDu" QString. // Check string "HiDu" QString.
// Continue. // Continue.
delete pstring; delete pstring;
dummyStatement(&str, &string, pstring); dummyStatement(&str, &string, &pstring);
} }
void testQString4() void testQString4()