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

android.xml is a settings file writtent by the SDK Installer

Browse Source 
Change-Id: If774202bff59f4f779b60c1a558ffd219a76fc1e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
BogDan Vatra
2012-12-07 19:52:47 +02:00
committed by Daniel Teske
parent ac3831d3ca
commit 9a536061cc
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,10 +83,10 @@ namespace {
const QLatin1String jarsignerName("jarsigner"); const QLatin1String jarsignerName("jarsigner");
const QLatin1String changeTimeStamp("ChangeTimeStamp"); const QLatin1String changeTimeStamp("ChangeTimeStamp");
static Utils::FileName settingsFileName() static QString sdkSettingsFileName()
{ {
return Utils::FileName::fromString(QString::fromLatin1("%1/qtcreator/android.xml") return QString::fromLatin1("%1/android.xml")
.arg(QFileInfo(Core::ICore::settings(QSettings::SystemScope)->fileName()).absolutePath())); .arg(QFileInfo(Core::ICore::settings(QSettings::SystemScope)->fileName()).absolutePath());
} }
bool androidDevicesLessThan(const AndroidDeviceInfo &dev1, const AndroidDeviceInfo &dev2) bool androidDevicesLessThan(const AndroidDeviceInfo &dev1, const AndroidDeviceInfo &dev2)
@@ -142,9 +142,8 @@ AndroidConfig::AndroidConfig(const QSettings &settings)
// user settings // user settings
PersistentSettingsReader reader; PersistentSettingsReader reader;
Utils::FileName fn = settingsFileName(); if (reader.load(FileName::fromString(sdkSettingsFileName()))
if (reader.load(fn) && settings.value(changeTimeStamp).toInt() != QFileInfo(sdkSettingsFileName()).lastModified().toMSecsSinceEpoch() / 1000) {
&& settings.value(changeTimeStamp).toInt() != fn.toFileInfo().lastModified().toMSecsSinceEpoch() / 1000) {
// persisten settings // persisten settings
sdkLocation = FileName::fromString(reader.restoreValue(SDKLocationKey).toString()); sdkLocation = FileName::fromString(reader.restoreValue(SDKLocationKey).toString());
ndkLocation = FileName::fromString(reader.restoreValue(NDKLocationKey).toString()); ndkLocation = FileName::fromString(reader.restoreValue(NDKLocationKey).toString());
@@ -182,7 +181,7 @@ AndroidConfig::AndroidConfig()
void AndroidConfig::save(QSettings &settings) const void AndroidConfig::save(QSettings &settings) const
{ {
QFileInfo fileInfo = settingsFileName().toFileInfo(); QFileInfo fileInfo(sdkSettingsFileName());
if (fileInfo.exists()) if (fileInfo.exists())
settings.setValue(changeTimeStamp, fileInfo.lastModified().toMSecsSinceEpoch() / 1000); settings.setValue(changeTimeStamp, fileInfo.lastModified().toMSecsSinceEpoch() / 1000);