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

Change-Id: If774202bff59f4f779b60c1a558ffd219a76fc1e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

src/plugins/android/androidconfigurations.cpp

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