diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-08-15 14:42:30 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-08-15 16:14:34 +0200 |
| commit | d9d0aba1c4870eaddd9ec3be1561ed0a39bcc74d (patch) | |
| tree | d2d40ffee8d17ae3193064d861894a5661908dd0 /src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp | |
| parent | 23536e9b426aba67880a9ef19e9c67517e642df0 (diff) | |
| parent | 8c133689be164cfdb8f77078a97dce3c97397afe (diff) | |
| download | qt-creator-d9d0aba1c4870eaddd9ec3be1561ed0a39bcc74d.tar.gz | |
Merge remote-tracking branch 'origin/3.2'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/coreplugin/editormanager/editormanager.cpp
src/plugins/projectexplorer/editorconfiguration.cpp
src/plugins/projectexplorer/projectfilewizardextension.cpp
src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp
Change-Id: I8de0f6fcdd8d214fbc14e79f74cb0206e6e2c6c1
Diffstat (limited to 'src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp')
| -rw-r--r-- | src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp b/src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp index 8e2f16239a..5c0aead33a 100644 --- a/src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp +++ b/src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp @@ -228,8 +228,11 @@ QString CreateAndroidManifestWizard::sourceFileName() const return srcFolder; Utils::FileName srcPath = Utils::FileName::fromString(srcFolder) - .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(); } |