aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/plugins/android/androiddebugsupport.cpp2
-rw-r--r--src/plugins/boot2qt/qdbdevicedebugsupport.cpp2
-rw-r--r--src/plugins/debugger/debuggerengine.cpp7
-rw-r--r--src/plugins/debugger/debuggerengine.h6
-rw-r--r--src/plugins/debugger/debuggerruncontrol.cpp12
-rw-r--r--src/plugins/debugger/debuggerruncontrol.h3
-rw-r--r--src/plugins/debugger/gdb/gdbengine.cpp4
-rw-r--r--src/plugins/debugger/lldb/lldbengine.cpp2
-rw-r--r--src/plugins/qnx/qnxdebugsupport.cpp4
-rw-r--r--src/plugins/qtapplicationmanager/appmanagerruncontrol.cpp2
10 files changed, 20 insertions, 24 deletions
diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp
index 4446fde8d1f..0b8c3c4b01a 100644
--- a/src/plugins/android/androiddebugsupport.cpp
+++ b/src/plugins/android/androiddebugsupport.cpp
@@ -124,7 +124,7 @@ public:
.pathAppended(apkDevicePreferredAbi(target));
solibSearchPath.append(androidLibsPath);
FilePath::removeDuplicates(solibSearchPath);
- setSolibSearchPath(solibSearchPath);
+ rp.setSolibSearchPath(solibSearchPath);
qCDebug(androidDebugSupportLog).noquote() << "SoLibSearchPath: " << solibSearchPath;
setSymbolFile(androidAppProcessDir(target).pathAppended("app_process"));
setSkipExecutableValidation(true);
diff --git a/src/plugins/boot2qt/qdbdevicedebugsupport.cpp b/src/plugins/boot2qt/qdbdevicedebugsupport.cpp
index ea67cdfb771..204430f3986 100644
--- a/src/plugins/boot2qt/qdbdevicedebugsupport.cpp
+++ b/src/plugins/boot2qt/qdbdevicedebugsupport.cpp
@@ -123,7 +123,7 @@ public:
rp.setCloseMode(KillAndExitMonitorAtClose);
worker->setUseContinueInsteadOfRun(true);
worker->setContinueAfterAttach(true);
- worker->addSolibSearchDir("%{sysroot}/system/lib");
+ rp.addSolibSearchDir("%{sysroot}/system/lib");
auto debuggee = createQdbDeviceInferiorWorker(runControl, QmlDebuggerServices);
worker->addStartDependency(debuggee);
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index 03f4b5e22fa..c609bde4e58 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -327,6 +327,13 @@ void DebuggerRunParameters::setStartMode(DebuggerStartMode startMode)
projectSourceDirectory = projects.first()->projectDirectory();
}
+void DebuggerRunParameters::addSolibSearchDir(const QString &str)
+{
+ QString path = str;
+ path.replace("%{sysroot}", sysRoot.toString());
+ m_solibSearchPath.append(FilePath::fromString(path));
+}
+
bool DebuggerRunParameters::isCppDebugging() const
{
return cppEngineType == GdbEngineType
diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h
index 4c603707afb..c788a593435 100644
--- a/src/plugins/debugger/debuggerengine.h
+++ b/src/plugins/debugger/debuggerengine.h
@@ -102,7 +102,9 @@ public:
void setAttachPid(qint64 pid) { m_attachPid = Utils::ProcessHandle(pid); }
Utils::ProcessHandle attachPid() const { return m_attachPid; }
- Utils::FilePaths solibSearchPath;
+ void setSolibSearchPath(const Utils::FilePaths &list) { m_solibSearchPath = list; }
+ void addSolibSearchDir(const QString &str);
+ Utils::FilePaths solibSearchPath() const { return m_solibSearchPath; }
// Used by Qml debugging.
QUrl qmlServer;
@@ -212,6 +214,8 @@ private:
QString m_displayName; // Used in the Snapshots view.
Utils::ProcessHandle m_attachPid;
+
+ Utils::FilePaths m_solibSearchPath;
};
namespace Internal {
diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp
index 5de6e7a6780..a664d98b7b7 100644
--- a/src/plugins/debugger/debuggerruncontrol.cpp
+++ b/src/plugins/debugger/debuggerruncontrol.cpp
@@ -683,11 +683,6 @@ void DebuggerRunTool::setupPortsGatherer()
setUsePortsGatherer(isCppDebugging(), isQmlDebugging());
}
-void DebuggerRunTool::setSolibSearchPath(const Utils::FilePaths &list)
-{
- m_runParameters.solibSearchPath = list;
-}
-
DebuggerEngineType DebuggerRunTool::cppEngineType() const
{
return m_runParameters.cppEngineType;
@@ -723,13 +718,6 @@ DebuggerRunTool::DebuggerRunTool(RunControl *runControl, AllowTerminal allowTerm
});
}
-void DebuggerRunTool::addSolibSearchDir(const QString &str)
-{
- QString path = str;
- path.replace("%{sysroot}", m_runParameters.sysRoot.toUrlishString());
- m_runParameters.solibSearchPath.append(FilePath::fromString(path));
-}
-
DebuggerRunTool::~DebuggerRunTool()
{
if (d->m_tempCoreFilePath.exists())
diff --git a/src/plugins/debugger/debuggerruncontrol.h b/src/plugins/debugger/debuggerruncontrol.h
index d8ee50ac518..878cfea0b19 100644
--- a/src/plugins/debugger/debuggerruncontrol.h
+++ b/src/plugins/debugger/debuggerruncontrol.h
@@ -30,8 +30,6 @@ public:
void start() override;
void stop() override;
- void setSolibSearchPath(const Utils::FilePaths &list);
-
void setStartMessage(const QString &msg);
void setCrashParameter(const QString &event);
@@ -76,7 +74,6 @@ public:
void setUsePortsGatherer(bool useCpp, bool useQml);
- void addSolibSearchDir(const QString &str);
void modifyDebuggerEnvironment(const Utils::EnvironmentItems &item);
void addSearchDirectory(const Utils::FilePath &dir);
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index aa2907318c6..f1d565d3db7 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -4452,9 +4452,9 @@ void GdbEngine::setupInferior()
if (rp.breakOnMain)
runCommand({"tbreak " + mainFunction()});
- if (!rp.solibSearchPath.isEmpty()) {
+ if (!rp.solibSearchPath().isEmpty()) {
DebuggerCommand cmd("appendSolibSearchPath");
- cmd.arg("path", transform(rp.solibSearchPath, &FilePath::path));
+ cmd.arg("path", transform(rp.solibSearchPath(), &FilePath::path));
cmd.arg("separator", HostOsInfo::pathListSeparator());
runCommand(cmd);
}
diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp
index 49c89dff833..37e3224f043 100644
--- a/src/plugins/debugger/lldb/lldbengine.cpp
+++ b/src/plugins/debugger/lldb/lldbengine.cpp
@@ -258,7 +258,7 @@ void LldbEngine::handleLldbStarted()
"settings append target.source-map " + it.key() + ' ' + expand(it.value()));
}
- for (const FilePath &path : rp.solibSearchPath)
+ for (const FilePath &path : rp.solibSearchPath())
executeDebuggerCommand("settings append target.exec-search-paths " + path.toUrlishString());
const FilePath &executable = rp.inferior().command.executable();
diff --git a/src/plugins/qnx/qnxdebugsupport.cpp b/src/plugins/qnx/qnxdebugsupport.cpp
index 3de0058c13e..3fdc64f9bcd 100644
--- a/src/plugins/qnx/qnxdebugsupport.cpp
+++ b/src/plugins/qnx/qnxdebugsupport.cpp
@@ -153,7 +153,7 @@ void showAttachToProcessDialog()
rp.setAttachPid(pid);
// setRunControlName(Tr::tr("Remote: \"%1\" - Process %2").arg(remoteChannel).arg(m_process.pid));
rp.setDisplayName(Tr::tr("Remote QNX process %1").arg(pid));
- debugger->setSolibSearchPath(FileUtils::toFilePathList(searchPaths(kit)));
+ rp.setSolibSearchPath(FileUtils::toFilePathList(searchPaths(kit)));
if (auto qtVersion = dynamic_cast<QnxQtVersion *>(QtSupport::QtKitAspect::qtVersion(kit)))
debugger->setSysRoot(qtVersion->qnxTarget());
debugger->setUseContinueInsteadOfRun(true);
@@ -206,7 +206,7 @@ public:
rp.setStartMode(AttachToRemoteServer);
rp.setCloseMode(KillAtClose);
debugger->setUseCtrlCStub(true);
- debugger->setSolibSearchPath(FileUtils::toFilePathList(searchPaths(k)));
+ rp.setSolibSearchPath(FileUtils::toFilePathList(searchPaths(k)));
if (auto qtVersion = dynamic_cast<QnxQtVersion *>(QtSupport::QtKitAspect::qtVersion(k))) {
debugger->setSysRoot(qtVersion->qnxTarget());
debugger->modifyDebuggerEnvironment(qtVersion->environment());
diff --git a/src/plugins/qtapplicationmanager/appmanagerruncontrol.cpp b/src/plugins/qtapplicationmanager/appmanagerruncontrol.cpp
index 057c0c703e7..258c00fb69d 100644
--- a/src/plugins/qtapplicationmanager/appmanagerruncontrol.cpp
+++ b/src/plugins/qtapplicationmanager/appmanagerruncontrol.cpp
@@ -168,7 +168,7 @@ private:
QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(runControl()->kit());
if (version) {
- setSolibSearchPath(version->qtSoPaths());
+ rp.setSolibSearchPath(version->qtSoPaths());
addSearchDirectory(version->qmlPath());
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-31 01:08:49 +0000