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

Merge remote-tracking branch 'origin/3.2'

Browse Source 
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
This commit is contained in:
Eike Ziller
2014-08-15 14:42:30 +02:00
parent 23536e9b42 8c133689be
commit d9d0aba1c4
103 changed files with 8606 additions and 4414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp
View File

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