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

Android: Fix Abi of qt versions

Browse Source 
Change-Id: I441e6e29305eb082a8d713ab9d26b7fce419a509
Reviewed-by: BogDan Vatra <bogdan@kde.org>
This commit is contained in:
Daniel Teske
2013-02-20 17:05:00 +01:00
parent 0a0debe387
commit 4ae4f05f91
4 changed files with 53 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -573,6 +573,8 @@ void AndroidConfigurations::updateAutomaticKitList()
continue;
if (!k->isAutoDetected())
continue;
if (k->isSdkProvided())
continue;
ProjectExplorer::ToolChain *tc = ProjectExplorer::ToolChainKitInformation::toolChain((k));
if (!tc)
continue;
@@ -604,6 +606,7 @@ void AndroidConfigurations::updateAutomaticKitList()
.arg(arch)
.arg(tc->ndkToolChainVersion())
.arg(qt->qtVersionString()));
newKit->setIconPath(QLatin1String(Constants::ANDROID_SETTINGS_CATEGORY_ICON));
DeviceTypeKitInformation::setDeviceTypeId(newKit, Core::Id(Constants::ANDROID_DEVICE_TYPE));
ToolChainKitInformation::setToolChain(newKit, tc);
QtSupport::QtKitInformation::setQtVersion(newKit, qt);