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

Android options: Stronger check for valid JDK location

Browse Source 
The location should contain bin/javac

Change-Id: If67ed4902b817f2d07302afb195e6dfbad881250
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Alessandro Portale
2014-03-12 11:11:34 +01:00
parent 0d7b820371
commit 388dc9947a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -216,7 +216,7 @@ void AndroidSettingsWidget::check(AndroidSettingsWidget::Mode mode)
m_javaState = NotSet;
} else {
Utils::FileName bin = m_androidConfig.openJDKLocation();
bin.appendPath(QLatin1String("bin"));
bin.appendPath(QLatin1String("bin/javac" QTC_HOST_EXE_SUFFIX));
if (!m_androidConfig.openJDKLocation().toFileInfo().exists()
|| !bin.toFileInfo().exists())
m_javaState = Error;