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

Merge remote-tracking branch 'origin/4.4'

Browse Source 
Change-Id: I9ab2c68d2bd07b0dd89051a2f5f6fa51676d8594
This commit is contained in:
Orgad Shaneh
2017-08-30 01:03:20 +03:00
parent 5ad44318eb a5625f2f9d
commit 139792ee25
92 changed files with 261 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/Android.json.in
View File

@@ -3,7 +3,7 @@
\"Version\" : \"$$QTCREATOR_VERSION\",
\"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\",
\"Vendor\" : \"KDE Necessitas\",
\"Copyright\" : \"(C) 2016 The Qt Company Ltd\",
\"Copyright\" : \"(C) $$QTCREATOR_COPYRIGHT_YEAR The Qt Company Ltd\",
\"License\" : [ \"Commercial Usage\",
\"\",
\"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and The Qt Company.\",

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

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