diff --git a/src/plugins/android/androiddebugsupport.cpp b/src/plugins/android/androiddebugsupport.cpp index 61b74e891f1..a9f430d43eb 100644 --- a/src/plugins/android/androiddebugsupport.cpp +++ b/src/plugins/android/androiddebugsupport.cpp @@ -152,7 +152,7 @@ public: << runControl->qmlChannel().toDisplayString(); //TODO: Not sure if these are the right paths. if (qtVersion) - addSearchDirectory(qtVersion->qmlPath()); + rp.addSearchDirectory(qtVersion->qmlPath()); } connect(this, &RunWorker::started, this, [this, packageName] { qCDebug(androidDebugSupportLog) << "Starting debugger - package name: " << packageName diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp index 6d5b09dfd26..72de7617234 100644 --- a/src/plugins/debugger/debuggerengine.cpp +++ b/src/plugins/debugger/debuggerengine.cpp @@ -2919,7 +2919,7 @@ QString DebuggerEngine::formatStartParameters() const if (!sp.projectSourceDirectory.isEmpty()) { str << "Project: " << sp.projectSourceDirectory.toUserOutput() << '\n'; str << "Additional Search Directories:"; - for (const FilePath &dir : sp.additionalSearchDirectories) + for (const FilePath &dir : sp.additionalSearchDirectories()) str << ' ' << dir; str << '\n'; } diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h index 4a3b14500a3..0d6fe86fa5a 100644 --- a/src/plugins/debugger/debuggerengine.h +++ b/src/plugins/debugger/debuggerengine.h @@ -147,7 +147,8 @@ public: void setUseTargetAsync(bool on) { m_useTargetAsync = on; } bool useTargetAsync() const { return m_useTargetAsync; } - Utils::FilePaths additionalSearchDirectories; + void addSearchDirectory(const Utils::FilePath &dir) { m_additionalSearchDirectories.append(dir); } + Utils::FilePaths additionalSearchDirectories() const { return m_additionalSearchDirectories; } // Used by iOS. QString platform; @@ -250,6 +251,8 @@ private: bool m_useCtrlCStub = false; // For QNX debugging. bool m_useTargetAsync = false; + + Utils::FilePaths m_additionalSearchDirectories; }; namespace Internal { diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp index 3bdd652f1be..d1359a1280d 100644 --- a/src/plugins/debugger/debuggerruncontrol.cpp +++ b/src/plugins/debugger/debuggerruncontrol.cpp @@ -189,11 +189,6 @@ void DebuggerRunTool::setCrashParameter(const QString &event) m_runParameters.crashParameter = event; } -void DebuggerRunTool::addSearchDirectory(const Utils::FilePath &dir) -{ - m_runParameters.additionalSearchDirectories.append(dir); -} - void DebuggerRunTool::start() { startCoreFileSetupIfNeededAndContinueStartup(); diff --git a/src/plugins/debugger/debuggerruncontrol.h b/src/plugins/debugger/debuggerruncontrol.h index cbdcc90ebbd..1139e682351 100644 --- a/src/plugins/debugger/debuggerruncontrol.h +++ b/src/plugins/debugger/debuggerruncontrol.h @@ -62,7 +62,6 @@ public: void setUsePortsGatherer(bool useCpp, bool useQml); void modifyDebuggerEnvironment(const Utils::EnvironmentItems &item); - void addSearchDirectory(const Utils::FilePath &dir); void setIosPlatform(const QString &platform); void setDeviceSymbolsRoot(const QString &deviceSymbolsRoot); diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index 99c24198651..abea227c1a2 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -2451,7 +2451,7 @@ FilePath QmlEngine::toFileInProject(const QUrl &fileUrl) const DebuggerRunParameters &rp = runParameters(); d->fileFinder.setProjectDirectory(rp.projectSourceDirectory); d->fileFinder.setProjectFiles(rp.projectSourceFiles); - d->fileFinder.setAdditionalSearchDirectories(rp.additionalSearchDirectories); + d->fileFinder.setAdditionalSearchDirectories(rp.additionalSearchDirectories()); d->fileFinder.setSysroot(rp.sysRoot); return d->fileFinder.findFile(fileUrl).constFirst(); diff --git a/src/plugins/qtapplicationmanager/appmanagerruncontrol.cpp b/src/plugins/qtapplicationmanager/appmanagerruncontrol.cpp index 1f0f5115d21..d7260e8543b 100644 --- a/src/plugins/qtapplicationmanager/appmanagerruncontrol.cpp +++ b/src/plugins/qtapplicationmanager/appmanagerruncontrol.cpp @@ -169,7 +169,7 @@ private: QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(runControl()->kit()); if (version) { rp.setSolibSearchPath(version->qtSoPaths()); - addSearchDirectory(version->qmlPath()); + rp.addSearchDirectory(version->qmlPath()); } auto sysroot = SysRootKitAspect().sysRoot(runControl()->kit());