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

Android: Fix default JDK path discovery

Browse Source 
Task-number: QTCREATORBUG-18691
Change-Id: Ibd17e7edf1c2cfdcc54ff2b9f16a9125bb217a84
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
This commit is contained in:
Vikas Pachdha
2017-08-08 14:27:54 +02:00
parent b6c1cb3487
commit 2e821a7730
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/android/androidconfigurations.cpp
View File

@@ -70,6 +70,7 @@
#include <QThread> #include <QThread>
#include <functional> #include <functional>
#include <memory>
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Utils; using namespace Utils;
@@ -82,7 +83,7 @@ namespace Android {
using namespace Internal; using namespace Internal;
namespace { namespace {
const char jdkSettingsPath[] = "HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit";
const QVersionNumber sdkToolsAntMissingVersion(25, 3, 0); const QVersionNumber sdkToolsAntMissingVersion(25, 3, 0);
const QLatin1String SettingsGroup("AndroidConfigurations"); const QLatin1String SettingsGroup("AndroidConfigurations");
@@ -1247,8 +1248,18 @@ void AndroidConfigurations::load()
} }
} }
} else if (HostOsInfo::isWindowsHost()) { } else if (HostOsInfo::isWindowsHost()) {
QSettings settings(QLatin1String("HKEY_LOCAL_MACHINE\\SOFTWARE\\Javasoft\\Java Development Kit"), QSettings::NativeFormat); QStringList allVersions;
QStringList allVersions = settings.childGroups(); std::unique_ptr<QSettings> settings(new QSettings(jdkSettingsPath,
QSettings::NativeFormat));
allVersions = settings->childGroups();
#ifdef Q_OS_WIN
#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
if (allVersions.isEmpty()) {
settings.reset(new QSettings(jdkSettingsPath, QSettings::Registry64Format));
allVersions = settings->childGroups();
}
#endif
#endif
QString javaHome; QString javaHome;
int major = -1; int major = -1;
int minor = -1; int minor = -1;
@@ -1264,9 +1275,9 @@ void AndroidConfigurations::load()
if (tmpMajor > major if (tmpMajor > major
|| (tmpMajor == major || (tmpMajor == major
&& tmpMinor > minor)) { && tmpMinor > minor)) {
settings.beginGroup(version); settings->beginGroup(version);
QString tmpJavaHome = settings.value(QLatin1String("JavaHome")).toString(); QString tmpJavaHome = settings->value(QLatin1String("JavaHome")).toString();
settings.endGroup(); settings->endGroup();
if (!QFileInfo::exists(tmpJavaHome)) if (!QFileInfo::exists(tmpJavaHome))
continue; continue;