Commit dedb9172 authored by BogDan Vatra's avatar BogDan Vatra

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: default avatarDaniel Teske <daniel.teske@digia.com>
parent 048ff52b
......@@ -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();
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment