summaryrefslogtreecommitdiff
path: root/src/plugins/android/androidmanager.cpp
diff options
context:
space:
mode:
authorDaniel Teske <daniel.teske@digia.com>2014-10-24 17:53:05 +0200
committerDaniel Teske <daniel.teske@digia.com>2014-10-27 11:54:58 +0100
commit26e0617a08a38a98ec7ce78c210e08849b3c2852 (patch)
tree808575be63b05b9a4dba4ac0f5918fe95782a43e /src/plugins/android/androidmanager.cpp
parentd739c9ff734733fef961c05b36404843086c582c (diff)
downloadqt-creator-26e0617a08a38a98ec7ce78c210e08849b3c2852.tar.gz
AndroidDeployQtStep: Fix deployment for qt 5.3
Task-number: QTCREATORBUG-13244 Change-Id: Iad4620a07994bd8944b48a117fac6a695a866205 Reviewed-by: Ulf Hermann <ulf.hermann@digia.com> Reviewed-by: BogDan Vatra <bogdan@kde.org>
Diffstat (limited to 'src/plugins/android/androidmanager.cpp')
-rw-r--r--src/plugins/android/androidmanager.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp
index 5c2881652b..84f1b612f5 100644
--- a/src/plugins/android/androidmanager.cpp
+++ b/src/plugins/android/androidmanager.cpp
@@ -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);