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

Unblock Maemo 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: I6c04481b57b1b7bd5437012b6507c6618323159e
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 0d11208036
commit 41a7d1c624
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/madde/maemodeviceconfigwizard.cpp
View File

@@ -577,7 +577,9 @@ IDevice::Ptr MaemoDeviceConfigWizard::device()
device->setFreePorts(PortList::fromString(freePortsSpec)); device->setFreePorts(PortList::fromString(freePortsSpec));
device->setSshParameters(sshParams); device->setSshParameters(sshParams);
if (doTest) { 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(); dlg.exec();
} }
return device; return device;