Commit 347d0e4e authored by Friedemann Kleint's avatar Friedemann Kleint Committed by hjk
Browse files

Unblock device test dialog on Qt 5.



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

Task-number: QTBUG-27039
Change-Id: I51d5d9fa07adca0570c2b91b50f84e143e592309
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent e518cdd4
......@@ -90,7 +90,9 @@ IDevice::Ptr GenericLinuxDeviceConfigurationWizard::device()
Core::Id(Constants::GenericLinuxOsType), IDevice::Hardware);
device->setFreePorts(Utils::PortList::fromString(QLatin1String("10000-10100")));
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();
return device;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment