diff options
| author | Eike Ziller <[email protected]> | 2023-03-29 12:21:50 +0200 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2023-03-29 12:21:50 +0200 |
| commit | b36287731eb8ab3895a1e7e19f071009dd1c1ad4 (patch) | |
| tree | 4a9999b27058b8efee4ed74cd40f4f16dd97b34f /src/plugins/android/androiddevice.cpp | |
| parent | 6ab923c39fd4ac66edb3cf708e3c789cb4a31428 (diff) | |
| parent | 81a5e2143cb7728316e02d24925f853e2db2099a (diff) | |
Merge remote-tracking branch 'origin/10.0'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
src/tools/perfparser
Change-Id: Ie5643100e0eb00e0933359dce320169b876f5634
Diffstat (limited to 'src/plugins/android/androiddevice.cpp')
| -rw-r--r-- | src/plugins/android/androiddevice.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp index b707b81cc6f..6346c47d7eb 100644 --- a/src/plugins/android/androiddevice.cpp +++ b/src/plugins/android/androiddevice.cpp @@ -646,6 +646,7 @@ void AndroidDeviceManager::setupDevicesWatcher() const CommandLine command = CommandLine(m_androidConfig.adbToolPath(), {"track-devices"}); m_adbDeviceWatcherProcess->setCommand(command); + m_adbDeviceWatcherProcess->setWorkingDirectory(command.executable().parentDir()); m_adbDeviceWatcherProcess->setEnvironment(AndroidConfigurations::toolsEnvironment(m_androidConfig)); m_adbDeviceWatcherProcess->start(); |