Commit 41a7d1c6 authored by Friedemann Kleint's avatar Friedemann Kleint Committed by hjk
Browse files

Unblock Maemo 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: I6c04481b57b1b7bd5437012b6507c6618323159e
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent 0d112080
......@@ -577,7 +577,9 @@ IDevice::Ptr MaemoDeviceConfigWizard::device()
device->setFreePorts(PortList::fromString(freePortsSpec));
device->setSshParameters(sshParams);
if (doTest) {
LinuxDeviceTestDialog dlg(device, new MaddeDeviceTester(this), this);
// Might be called after accept.
QWidget *parent = isVisible() ? this : static_cast<QWidget *>(0);
LinuxDeviceTestDialog dlg(device, new MaddeDeviceTester(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