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

Remove some obsolete code inside QT_VERSION_CHECK sections

Browse Source 
With Qt 5.9 as minimal build version, we don't need to handle 5.7 or 5.8

Change-Id: Ie1eed95ab46364452b0633f78bebc565a4a63f4a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Alessandro Portale
2018-04-25 13:24:28 +02:00
parent 4533015c66
commit 1dbdd259be
5 changed files with 2 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1228,13 +1228,12 @@ void AndroidConfigurations::load()
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
#endif // Q_OS_WIN
QString javaHome;
int major = -1;
int minor = -1;