From 79db165dcb7c6999ccc9241910b7f762f358188a Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 21 Dec 2011 20:14:42 +0100 Subject: Revert "Remote Linux: Rework device testing" This reverts commit 934c067ddf365c6f12b1e4a1e431f27610b32f7d, because it breaks running remote Linux applications due to buggy refactoring of the remote ports gatherer. Change-Id: I15fd8d4f3e76452a8c5c735316991bd00900444f Reviewed-by: Christian Kandeler --- .../genericlinuxdeviceconfigurationwizard.cpp | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp') diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp index 8bba285cf4..bbb838d98d 100644 --- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp +++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp @@ -30,17 +30,12 @@ **************************************************************************/ #include "genericlinuxdeviceconfigurationwizard.h" -#include "genericlinuxdeviceconfigurationfactory.h" #include "genericlinuxdeviceconfigurationwizardpages.h" #include "linuxdevicetestdialog.h" #include "linuxdevicetester.h" #include "portlist.h" #include "remotelinux_constants.h" -#include - -#include - using namespace Utils; namespace RemoteLinux { @@ -92,16 +87,8 @@ LinuxDeviceConfiguration::Ptr GenericLinuxDeviceConfigurationWizard::deviceConfi LinuxDeviceConfiguration::Ptr devConf = LinuxDeviceConfiguration::create(d->setupPage.configurationName(), QLatin1String(Constants::GenericLinuxOsType), LinuxDeviceConfiguration::Hardware, PortList::fromString(QLatin1String("10000-10100")), sshParams); - - GenericLinuxDeviceConfigurationFactory *factory = - ExtensionSystem::PluginManager::instance()->getObject(); - QTC_ASSERT(factory, return LinuxDeviceConfiguration::Ptr(0)); - - QDialog *dlg = factory->createDeviceAction(QLatin1String(Constants::GenericTestDeviceActionId), devConf, 0); - QTC_ASSERT(dlg, return LinuxDeviceConfiguration::Ptr(0)); - dlg->exec(); - delete dlg; - + LinuxDeviceTestDialog dlg(devConf, new GenericLinuxDeviceTester(this), this); + dlg.exec(); return devConf; } -- cgit v1.2.1