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

Android: Remove a cast in AndroidDeployQtStep::init

Browse Source 
Don't do an additional dynamic_cast.

Change-Id: Icf3beda4e78bc03232689439e8ba264287b603ab
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Alessandro Portale
2022-01-14 17:14:02 +01:00
parent 2a1ce51ce3
commit 2cd7d89ec5
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/android/androiddeployqtstep.cpp
View File

@@ -164,14 +164,15 @@ bool AndroidDeployQtStep::init()
if (selectedAbis.isEmpty()) if (selectedAbis.isEmpty())
selectedAbis.append(bs->extraData(buildKey, Constants::AndroidAbi).toString()); selectedAbis.append(bs->extraData(buildKey, Constants::AndroidAbi).toString());
// TODO: use AndroidDevice directly instead of AndroidDeviceInfo.
if (!info.isValid()) { if (!info.isValid()) {
const IDevice *dev = DeviceKitAspect::device(kit()).data(); const auto dev =
static_cast<const AndroidDevice *>(DeviceKitAspect::device(kit()).data());
if (!dev) { if (!dev) {
reportWarningOrError(tr("No valid deployment device is set."), Task::Error); reportWarningOrError(tr("No valid deployment device is set."), Task::Error);
return false; return false;
} }
// TODO: use AndroidDevice directly instead of AndroidDeviceInfo.
info = AndroidDevice::androidDeviceInfoFromIDevice(dev); info = AndroidDevice::androidDeviceInfoFromIDevice(dev);
m_deviceInfo = info; // Keep around for later steps m_deviceInfo = info; // Keep around for later steps
@@ -181,18 +182,17 @@ bool AndroidDeployQtStep::init()
return false; return false;
} }
const AndroidDevice *androidDev = static_cast<const AndroidDevice *>(dev); if (!dev->canSupportAbis(selectedAbis)) {
if (androidDev && !androidDev->canSupportAbis(selectedAbis)) {
const QString error = tr("The deployment device \"%1\" does not support the " const QString error = tr("The deployment device \"%1\" does not support the "
"architectures used by the kit.\n" "architectures used by the kit.\n"
"The kit supports \"%2\", but the device uses \"%3\".") "The kit supports \"%2\", but the device uses \"%3\".")
.arg(dev->displayName()).arg(selectedAbis.join(", ")) .arg(dev->displayName()).arg(selectedAbis.join(", "))
.arg(androidDev->supportedAbis().join(", ")); .arg(dev->supportedAbis().join(", "));
reportWarningOrError(error, Task::Error); reportWarningOrError(error, Task::Error);
return false; return false;
} }
if (androidDev && !androidDev->canHandleDeployments()) { if (!dev->canHandleDeployments()) {
reportWarningOrError(tr("The deployment device \"%1\" is disconnected.") reportWarningOrError(tr("The deployment device \"%1\" is disconnected.")
.arg(dev->displayName()), Task::Error); .arg(dev->displayName()), Task::Error);
return false; return false;