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:
	src/plugins/clangtools/clangtoolssettings.cpp
	src/plugins/clangtools/executableinfo.cpp
	src/plugins/clangtools/executableinfo.h

Change-Id: Id8caf63e3e594792467d3447870086bd2d8f73b9
This commit is contained in:
Eike Ziller
2021-09-13 15:36:51 +02:00
parent c941f7d0f5 7e965629b0
commit 3d4d7c7e14
98 changed files with 1321 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/android/androidmanager.cpp
View File

@@ -141,7 +141,10 @@ int AndroidManager::minimumSDK(const Target *target)
QDomDocument doc;
if (!openXmlFile(doc, AndroidManager::manifestSourcePath(target)))
return minimumSDK(target->kit());
return parseMinSdk(doc.documentElement());
const int minSdkVersion = parseMinSdk(doc.documentElement());
if (minSdkVersion == 0)
return AndroidManager::defaultMinimumSDK(QtSupport::QtKitAspect::qtVersion(target->kit()));
return minSdkVersion;
}
/*!
@@ -150,17 +153,19 @@ int AndroidManager::minimumSDK(const Target *target)
*/
int AndroidManager::minimumSDK(const Kit *kit)
{
int minSDKVersion = -1;
int minSdkVersion = -1;
QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(kit);
if (version && version->targetDeviceTypes().contains(Constants::ANDROID_DEVICE_TYPE)) {
FilePath stockManifestFilePath = FilePath::fromUserInput(
version->prefix().toString() + "/src/android/templates/AndroidManifest.xml");
QDomDocument doc;
if (openXmlFile(doc, stockManifestFilePath)) {
minSDKVersion = parseMinSdk(doc.documentElement());
minSdkVersion = parseMinSdk(doc.documentElement());
}
}
return minSDKVersion;
if (minSdkVersion == 0)
return AndroidManager::defaultMinimumSDK(version);
return minSdkVersion;
}
QString AndroidManager::buildTargetSDK(const Target *target)