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

Prepare Qt Creator to have a flexible settings-path.

Browse Source 
Change-Id: I4fcb5cbf36013eb5ba9c93155a167ee7f097627b
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Reviewed-by: BogDan Vatra <bog_dan_ro@yahoo.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
tjenssen
2012-05-10 16:19:10 +02:00
committed by Eike Ziller
parent e271000bf7
commit bbfc49fe4d
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,13 +82,12 @@ namespace {
const QLatin1String Unknown("unknown");
const QLatin1String keytoolName("keytool");
const QLatin1String jarsignerName("jarsigner");
const QLatin1String androidFilename("/android.xml");
const QLatin1String changeTimeStamp("ChangeTimeStamp");
static QString settingsFileName()
{
return Core::ICore::instance()->resourcePath()
+ QLatin1String("/Nokia") + androidFilename;
return QString::fromLatin1("%1/qtcreator/android.xml").arg(
QFileInfo(Core::ICore::settings(QSettings::SystemScope)->fileName()).absolutePath());
}
bool androidDevicesLessThan(const AndroidDevice &dev1, const AndroidDevice &dev2)