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

AndroidDeployQtStep: Fix deployment for qt 5.3

Browse Source 
Task-number: QTCREATORBUG-13244
Change-Id: Iad4620a07994bd8944b48a117fac6a695a866205
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
This commit is contained in:
Daniel Teske
2014-10-24 17:53:05 +02:00
parent d739c9ff73
commit 26e0617a08
4 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,6 +123,15 @@ QString AndroidManager::packageName(ProjectExplorer::Target *target)
return manifestElem.attribute(QLatin1String("package"));
}
QString AndroidManager::packageName(const Utils::FileName &manifestFile)
{
QDomDocument doc;
if (!openXmlFile(doc, manifestFile))
return QString();
QDomElement manifestElem = doc.documentElement();
return manifestElem.attribute(QLatin1String("package"));
}
QString AndroidManager::intentName(ProjectExplorer::Target *target)
{
return packageName(target) + QLatin1Char('/') + activityName(target);