From dedb9172e04f50cadc869e94bd6235dff5b94aa9 Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Tue, 5 Aug 2014 15:32:01 +0300 Subject: [PATCH] Android: On Qt 5.4 AndroidManifest.xml is moved to templates folder If we don't find it in the java folder we return the templates folder. Change-Id: I8a9c478ed3f9e32e9ed8c656545ab90c18204e52 Reviewed-by: Daniel Teske --- src/plugins/android/createandroidmanifestwizard.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/plugins/android/createandroidmanifestwizard.cpp b/src/plugins/android/createandroidmanifestwizard.cpp index fffe8e5e5b4..aba99cc42aa 100644 --- a/src/plugins/android/createandroidmanifestwizard.cpp +++ b/src/plugins/android/createandroidmanifestwizard.cpp @@ -212,8 +212,12 @@ QString CreateAndroidManifestWizard::sourceFileName() const return result; Utils::FileName srcPath = Utils::FileName::fromString(version->qmakeProperty("QT_INSTALL_PREFIX")) - .appendPath(QLatin1String("src/android/java")); - srcPath.appendPath(QLatin1String("AndroidManifest.xml")); + .appendPath(QLatin1String("src/android")); + if (QFile::exists(srcPath.toString() + QLatin1String("/templates/AndroidManifest.xml"))) + srcPath.appendPath(QLatin1String("/templates/AndroidManifest.xml")); + else + srcPath.appendPath(QLatin1String("/java/AndroidManifest.xml")); + return srcPath.toString(); }