feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

AndroidSettingsDialog: Don't clear sdk/ndk setting on canceling browse

Browse Source 
Task-number: QTCREATORBUG-11410
Change-Id: I0efc6521d2e00597b45080455d03e83b3966f103
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
This commit is contained in:
Daniel Teske
2014-02-04 12:28:22 +01:00
parent d90d6f40b3
commit 25e206f59a
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androidsettingswidget.cpp
View File

@@ -375,6 +375,8 @@ void AndroidSettingsWidget::browseSDKLocation()
Utils::FileName dir = Utils::FileName::fromString( Utils::FileName dir = Utils::FileName::fromString(
QFileDialog::getExistingDirectory(this, tr("Select Android SDK folder"), QFileDialog::getExistingDirectory(this, tr("Select Android SDK folder"),
m_ui->SDKLocationLineEdit->text())); m_ui->SDKLocationLineEdit->text()));
if (dir.isEmpty())
return;
m_ui->SDKLocationLineEdit->setText(dir.toUserOutput()); m_ui->SDKLocationLineEdit->setText(dir.toUserOutput());
sdkLocationEditingFinished(); sdkLocationEditingFinished();
} }
@@ -384,6 +386,8 @@ void AndroidSettingsWidget::browseNDKLocation()
Utils::FileName dir = Utils::FileName::fromString( Utils::FileName dir = Utils::FileName::fromString(
QFileDialog::getExistingDirectory(this, tr("Select Android NDK folder"), QFileDialog::getExistingDirectory(this, tr("Select Android NDK folder"),
m_ui->NDKLocationLineEdit->text())); m_ui->NDKLocationLineEdit->text()));
if (dir.isEmpty())
return;
m_ui->NDKLocationLineEdit->setText(dir.toUserOutput()); m_ui->NDKLocationLineEdit->setText(dir.toUserOutput());
ndkLocationEditingFinished(); ndkLocationEditingFinished();
} }