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

Fix Android plugin.

Browse Source 
Change-Id: I56533be94fc868d04bd1d289ff9d3c381391d41b
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
BogDan Vatra
2012-06-23 12:24:44 +03:00
committed by Tobias Hunger
parent a1d4afad67
commit bb0573a8aa
12 changed files with 183 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -217,12 +217,12 @@ bool AndroidSettingsWidget::checkNDK(const Utils::FileName &location)
QMessageBox::critical(this, tr("Android SDK Folder"), tr("\"%1\" doesn't seem to be an Android NDK top folder").arg(location.toUserOutput()));
return false;
}
m_androidConfig.ndkLocation = location;
m_ui->toolchainVersionComboBox->setEnabled(true);
m_ui->GdbLocationLineEdit->setEnabled(true);
m_ui->GdbLocationPushButton->setEnabled(true);
m_ui->GdbserverLocationLineEdit->setEnabled(true);
m_ui->GdbserverLocationPushButton->setEnabled(true);
fillToolchainVersions();
return true;
}
@@ -243,10 +243,10 @@ void AndroidSettingsWidget::sdkLocationEditingFinished()
void AndroidSettingsWidget::ndkLocationEditingFinished()
{
Utils::FileName location = Utils::FileName::fromUserInput(m_ui->NDKLocationLineEdit->text());
if (checkNDK(location))
if (!checkNDK(location))
return;
m_androidConfig.ndkLocation = location;
saveSettings(true);
fillToolchainVersions();
}
void AndroidSettingsWidget::fillToolchainVersions()