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

Merge remote-tracking branch 'origin/4.7'

Browse Source 
Change-Id: I00b0009867322be55c215351054acc7de5b9e335
This commit is contained in:
Eike Ziller
2018-07-12 14:56:13 +02:00
parent c17a1ce249 d7733bafe1
commit 98479ba312
153 changed files with 3087 additions and 1501 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -418,7 +418,7 @@ FileName AndroidConfig::aaptToolPath() const
aaptToolPath.appendPath("build-tools");
QString toolPath = QString("%1/aapt").arg(buildToolsVersion().toString());
if (HostOsInfo::isWindowsHost())
toolPath += ANDROID_BAT_SUFFIX;
toolPath += QTC_HOST_EXE_SUFFIX;
aaptToolPath.appendPath(toolPath);
return aaptToolPath;
}