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

Revert "Remote Linux: Rework device testing"

Browse Source 
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 <christian.kandeler@nokia.com>
This commit is contained in:
Christian Kandeler
2011-12-21 20:14:42 +01:00
parent 3b67e5dd37
commit 79db165dcb
22 changed files with 705 additions and 615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp
View File

@@ -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 <extensionsystem/pluginmanager.h>
#include <utils/qtcassert.h>
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<GenericLinuxDeviceConfigurationFactory>();
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;
}