lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-12 13:00:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow configured adb path to be empty, look for adb in shipped path

Browse Source 
* On windows we ship adb.exe under android/ so that there's no configure
  needed. Look for that file if there isn't an override path.
This commit is contained in:
baldurk
2017-06-14 17:09:22 +01:00
committed by Baldur Karlsson
parent 6423a82d18
commit e0104e8fe0
5 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/Interface/PersistantConfig.cpp
-3
View File
@@ -186,9 +186,6 @@ void PersistantConfig::AddAndroidHosts()
// Set the config setting as it will be reused when we start the remoteserver etc.
SetConfigSetting(lit("adbExePath"), adbExePath);
if(adbExePath.isEmpty())
return; // adb path must be non-empty in the Options dialog.
SetConfigSetting(lit("MaxConnectTimeout"), QString::number(Android_MaxConnectTimeout));
rdctype::str androidHosts;
qrenderdoc/Windows/Dialogs/SettingsDialog.cpp
+4 -1
View File
@@ -347,7 +347,10 @@ void SettingsDialog::on_browseAdbPath_clicked()
QFileInfo(m_Ctx.Config().Android_AdbExecutablePath).absoluteDir().path());
if(!adb.isEmpty())
{
ui->Android_AdbExecutablePath->setText(adb);
m_Ctx.Config().Android_AdbExecutablePath = adb;
}
m_Ctx.Config().Save();
}
@@ -361,7 +364,7 @@ void SettingsDialog::on_Android_MaxConnectTimeout_valueChanged(double timeout)
void SettingsDialog::on_Android_AdbExecutablePath_textEdited(const QString &adb)
{
if(QFileInfo::exists(adb))
if(QFileInfo::exists(adb) || adb.isEmpty())
m_Ctx.Config().Android_AdbExecutablePath = adb;
m_Ctx.Config().Save();