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

Merge remote-tracking branch 'origin/5.0'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/android/createandroidmanifestwizard.cpp

Change-Id: Ibd06a254f52c2c96d8c6ddd6b1d27483fcc29a17
This commit is contained in:
Eike Ziller
2021-08-16 10:51:50 +02:00
parent 80d8bca395 2ab7176e79
commit ab606faad2
47 changed files with 435 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -315,7 +315,7 @@ void CreateAndroidManifestWizard::createAndroidTemplateFiles()
if (m_copyGradle) {
FilePath gradlePath = version->prefix() / "src/3rdparty/gradle";
if (!gradlePath.exists())
gradlePath = AndroidConfigurations::currentConfig().sdkLocation() / "/tools/templates/gradle/wrapper";
gradlePath = AndroidConfigurations::currentConfig().sdkLocation() / "tools/templates/gradle/wrapper";
FileUtils::copyRecursively(gradlePath, m_directory, nullptr, copy);
}