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

Android: On Qt 5.4 AndroidManifest.xml is moved to templates folder

Browse Source 
If we don't find it in the java folder we return the templates folder.

Change-Id: I8a9c478ed3f9e32e9ed8c656545ab90c18204e52
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
BogDan Vatra
2014-08-05 15:32:01 +03:00
parent 048ff52b4c
commit dedb9172e0
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/android/createandroidmanifestwizard.cpp
View File

@@ -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();
}