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

Fix Android plugin.

Browse Source 
Change-Id: I56533be94fc868d04bd1d289ff9d3c381391d41b
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
BogDan Vatra
2012-06-23 12:24:44 +03:00
committed by Tobias Hunger
parent a1d4afad67
commit bb0573a8aa
12 changed files with 183 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/android/androidmanager.cpp
View File

@@ -432,10 +432,15 @@ bool AndroidManager::createAndroidTemplatesIfNecessary(ProjectExplorer::Target *
}
}
Utils::FileName src = androidPath;
src.appendPath("src");
Utils::FileName res = androidPath;
res.appendPath("res");
if (!forceUpdate && androidPath.toFileInfo().exists()
&& manifestPath(target).toFileInfo().exists()
&& androidPath.append(QLatin1String("/src")).toFileInfo().exists()
&& androidPath.append(QLatin1String("/res")).toFileInfo().exists())
&& src.toFileInfo().exists()
&& res.toFileInfo().exists())
return true;
forceUpdate &= androidPath.toFileInfo().exists();