From 0ffe7f482daab21b119fc75b2b5a577ef64250ba Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Thu, 24 Jul 2014 10:04:33 +0200 Subject: 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 --- src/plugins/android/androidmanager.cpp | 26 -------------------------- 1 file changed, 26 deletions(-) (limited to 'src/plugins/android/androidmanager.cpp') diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index 7456baf454..8ea68d46bb 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -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); -- cgit v1.2.1