summaryrefslogtreecommitdiff
path: root/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@digia.com>2013-06-27 17:12:08 +0200
committerChristian Kandeler <christian.kandeler@digia.com>2013-07-02 15:02:48 +0200
commit5bca241afb51e89688b88e0dfb6580a5cf23372e (patch)
tree662b933af89d2fe4c76eb1b470239274e7264b88 /src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp
parentd6062643c3994059233fc5e3b082932842c20a81 (diff)
downloadqt-creator-5bca241afb51e89688b88e0dfb6580a5cf23372e.tar.gz
Device support: Make device testing a "well-known" concept.
This entails the following: - Rename AbstractLinuxDeviceTester to DeviceTester and move it up into ProjectExplorer. The class stays unchanged, as there was nothing Linux-specific about it. The same goes for the associated dialog. - Move the createDeviceTester() function from LinuxDevice to IDevice and introduce IDevice::hasDeviceTester() to enable generic code to make use of this feature. - Move device testing out of the list of opaque device-specific actions; instead, the device settings widget now uses the device tester directly, if applicable. Rationale: - Device testing, just like remote process listing (if not more so), is a general concept that implementors of device classes will probably want to implement (and they should be encouraged to do so). Without the mechanism provided here, they would all need to put basically the same code into the actionIds(), displayNameForActionId() and executeAction() functions. This patch is the natural extension of b90e3bbd8bea27ad915a4d9033e0d5bda26f5667. Change-Id: I94f2badb4ceeda9f5cd3b066c13626bb4f65505d Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp')
-rw-r--r--src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp
index c33bef0c8e..8ad502a052 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp
@@ -31,8 +31,6 @@
#include "genericlinuxdeviceconfigurationwizardpages.h"
#include "linuxdevice.h"
-#include "linuxdevicetestdialog.h"
-#include "linuxdevicetester.h"
#include "remotelinux_constants.h"
#include <utils/portlist.h>
@@ -91,10 +89,6 @@ IDevice::Ptr GenericLinuxDeviceConfigurationWizard::device()
Core::Id(Constants::GenericLinuxOsType), IDevice::Hardware);
device->setFreePorts(Utils::PortList::fromString(QLatin1String("10000-10100")));
device->setSshParameters(sshParams);
- // Might be called after accept.
- QWidget *parent = isVisible() ? this : static_cast<QWidget *>(0);
- LinuxDeviceTestDialog dlg(device, new GenericLinuxDeviceTester(this), parent);
- dlg.exec();
return device;
}