From 347d0e4e5a11240f8cf7250ac8c0227fa2b3f811 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 3 Sep 2012 17:21:31 +0200 Subject: [PATCH] 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: hjk --- .../remotelinux/genericlinuxdeviceconfigurationwizard.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp index 083a636bb37..e87802eb72e 100644 --- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp +++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp @@ -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(0); + LinuxDeviceTestDialog dlg(device, new GenericLinuxDeviceTester(this), parent); dlg.exec(); return device; }