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

Unblock device test dialog on Qt 5.

Browse Source 
Do not open the dialog with the wizard as parent after
QWizard::exec() has finished.

Task-number: QTBUG-27039
Change-Id: I51d5d9fa07adca0570c2b91b50f84e143e592309
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Friedemann Kleint
2012-09-03 17:21:31 +02:00
committed by hjk
parent e518cdd44b
commit 347d0e4e5a
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,7 +90,9 @@ IDevice::Ptr GenericLinuxDeviceConfigurationWizard::device()
Core::Id(Constants::GenericLinuxOsType), IDevice::Hardware); Core::Id(Constants::GenericLinuxOsType), IDevice::Hardware);
device->setFreePorts(Utils::PortList::fromString(QLatin1String("10000-10100"))); device->setFreePorts(Utils::PortList::fromString(QLatin1String("10000-10100")));
device->setSshParameters(sshParams); device->setSshParameters(sshParams);
LinuxDeviceTestDialog dlg(device, new GenericLinuxDeviceTester(this), this); // Might be called after accept.
QWidget *parent = isVisible() ? this : static_cast<QWidget *>(0);
LinuxDeviceTestDialog dlg(device, new GenericLinuxDeviceTester(this), parent);
dlg.exec(); dlg.exec();
return device; return device;
} }