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

AndroidSettingsDialog: Warn the user that spaces in the ndk path are bad

Browse Source 
Task-number: QTCREATORBUG-11629
Change-Id: I576940fa5ac3fd47376cf3fc700689e1046387b0
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
This commit is contained in:
Daniel Teske
2014-03-18 15:55:22 +01:00
parent c751e2d685
commit 41d3f0f2f2
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -172,6 +172,11 @@ void AndroidSettingsWidget::check(AndroidSettingsWidget::Mode mode)
|| !toolChainPath.appendPath(QLatin1String("toolchains")).toFileInfo().exists() || !toolChainPath.appendPath(QLatin1String("toolchains")).toFileInfo().exists()
|| !sourcesPath.appendPath(QLatin1String("sources/cxx-stl")).toFileInfo().exists()) { || !sourcesPath.appendPath(QLatin1String("sources/cxx-stl")).toFileInfo().exists()) {
m_ndkState = Error; m_ndkState = Error;
m_ndkErrorMessage = tr("\"%1\" does not seem to be an Android NDK top folder.")
.arg(m_androidConfig.ndkLocation().toUserOutput());
} else if (platformPath.toString().contains(QLatin1String(" "))) {
m_ndkState = Error;
m_ndkErrorMessage = tr("The Android NDK cannot be installed into a path with spaces.");
} else { } else {
QList<AndroidToolChainFactory::AndroidToolChainInformation> compilerPaths QList<AndroidToolChainFactory::AndroidToolChainInformation> compilerPaths
= AndroidToolChainFactory::toolchainPathsForNdk(m_androidConfig.ndkLocation()); = AndroidToolChainFactory::toolchainPathsForNdk(m_androidConfig.ndkLocation());
@@ -242,14 +247,13 @@ void AndroidSettingsWidget::applyToUi(AndroidSettingsWidget::Mode mode)
} }
if (mode & Ndk) { if (mode & Ndk) {
Utils::FileName location = Utils::FileName::fromUserInput(m_ui->NDKLocationLineEdit->text());
if (m_ndkState == NotSet) { if (m_ndkState == NotSet) {
m_ui->ndkWarningIconLabel->setVisible(false); m_ui->ndkWarningIconLabel->setVisible(false);
m_ui->toolchainFoundLabel->setVisible(false); m_ui->toolchainFoundLabel->setVisible(false);
m_ui->kitWarningIconLabel->setVisible(false); m_ui->kitWarningIconLabel->setVisible(false);
m_ui->kitWarningLabel->setVisible(false); m_ui->kitWarningLabel->setVisible(false);
} else if (m_ndkState == Error) { } else if (m_ndkState == Error) {
m_ui->toolchainFoundLabel->setText(tr("\"%1\" does not seem to be an Android NDK top folder.").arg(location.toUserOutput())); m_ui->toolchainFoundLabel->setText(m_ndkErrorMessage);
m_ui->toolchainFoundLabel->setVisible(true); m_ui->toolchainFoundLabel->setVisible(true);
m_ui->ndkWarningIconLabel->setVisible(true); m_ui->ndkWarningIconLabel->setVisible(true);
m_ui->kitWarningIconLabel->setVisible(false); m_ui->kitWarningIconLabel->setVisible(false);

1
src/plugins/android/androidsettingswidget.h
View File

@@ -103,6 +103,7 @@ private:
State m_sdkState; State m_sdkState;
State m_ndkState; State m_ndkState;
QString m_ndkErrorMessage;
int m_ndkCompilerCount; int m_ndkCompilerCount;
QString m_ndkMissingQtArchs; QString m_ndkMissingQtArchs;
State m_javaState; State m_javaState;