Android: Remove unused variable

/home/nik/dev/creator/creator-master/src/plugins/qmakeprojectmanager/androidpackageinstallationstep.cpp:49:12:
warning: unused variable 'ANDROIDDIRECTORY' [-Wunused-const-variable]
const char ANDROIDDIRECTORY[] =
"Android.AndroidPackageInstallationStep.AndroidDirectory";
           ^

Change-Id: Idd4a17ef113fbeaf40a97d4966ea5438a6cd2f4e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Nikolai Kosjar
2014-07-24 10:04:33 +02:00
parent ebabc837b8
commit 0ffe7f482d

View File

@@ -462,32 +462,6 @@ static QStringList libsXml(ProjectExplorer::Target *target, const QString &tag)
return libs;
}
static int setLibraryLevel(const QString &library, LibrariesMap &mapLibs)
{
int maxlevel = mapLibs[library].level;
if (maxlevel > 0)
return maxlevel;
foreach (QString lib, mapLibs[library].dependencies) {
foreach (const QString &key, mapLibs.keys()) {
if (library == key)
continue;
if (key == lib) {
int libLevel = mapLibs[key].level;
if (libLevel < 0)
libLevel = setLibraryLevel(key, mapLibs);
if (libLevel > maxlevel)
maxlevel = libLevel;
break;
}
}
}
if (mapLibs[library].level < 0)
mapLibs[library].level = maxlevel + 1;
return maxlevel + 1;
}
void AndroidManager::cleanLibsOnDevice(ProjectExplorer::Target *target)
{
const QString targetArch = AndroidManager::targetArch(target);