forked from qt-creator/qt-creator
QNX/RemoteLinux/Madde: Made device test more generic
Any device inheriting from LinuxDevice can now implement a createDeviceTester() method to return their own AbstractLinuxDeviceTester that runs when the device wizard is completed, or when the Test Device button is pressed. The MaddeDevice implementation of the device actions now completely matches that of LinuxDevice, so those are removed. The QNX device check was improved with additional tool checking. Change-Id: Ie761b7cfc5591238aa2a18a74fe1843fb2cdbeaa Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
committed by
Tobias Nätterlund
parent
f3eedaf300
commit
b90e3bbd8b
@@ -214,7 +214,7 @@ void LinuxDevice::executeAction(Core::Id actionId, QWidget *parent) const
|
||||
QDialog *d = 0;
|
||||
const LinuxDevice::ConstPtr device = sharedFromThis().staticCast<const LinuxDevice>();
|
||||
if (actionId == Constants::GenericTestDeviceActionId)
|
||||
d = new LinuxDeviceTestDialog(device, new GenericLinuxDeviceTester, parent);
|
||||
d = new LinuxDeviceTestDialog(device, createDeviceTester(), parent);
|
||||
else if (actionId == Constants::GenericDeployKeyToDeviceActionId)
|
||||
d = PublicKeyDeploymentDialog::createDialog(device, parent);
|
||||
if (d)
|
||||
@@ -264,4 +264,9 @@ DeviceProcessList *LinuxDevice::createProcessListModel(QObject *parent) const
|
||||
return new LinuxDeviceProcessList(sharedFromThis(), parent);
|
||||
}
|
||||
|
||||
AbstractLinuxDeviceTester *LinuxDevice::createDeviceTester() const
|
||||
{
|
||||
return new GenericLinuxDeviceTester;
|
||||
}
|
||||
|
||||
} // namespace RemoteLinux
|
||||
|
||||
Reference in New Issue
Block a user