diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-09-03 17:21:31 +0200 |
---|---|---|
committer | hjk <qthjk@ovi.com> | 2012-09-03 17:35:10 +0200 |
commit | 347d0e4e5a11240f8cf7250ac8c0227fa2b3f811 (patch) | |
tree | 4802d734e5f8be787029145b4e23263c3e945499 /src/plugins/remotelinux | |
parent | e518cdd44b29b5bd9d6dc0ef317975d88786b853 (diff) | |
download | qt-creator-347d0e4e5a11240f8cf7250ac8c0227fa2b3f811.tar.gz |
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 <qthjk@ovi.com>
Diffstat (limited to 'src/plugins/remotelinux')
-rw-r--r-- | src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp index 083a636bb3..e87802eb72 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<QWidget *>(0); + LinuxDeviceTestDialog dlg(device, new GenericLinuxDeviceTester(this), parent); dlg.exec(); return device; } |