From 41a7d1c6248f2238a724856c17ebcbfba0614fa6 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Mon, 3 Sep 2012 17:21:31 +0200
Subject: [PATCH] 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: hjk <qthjk@ovi.com>
---
 src/plugins/madde/maemodeviceconfigwizard.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/plugins/madde/maemodeviceconfigwizard.cpp b/src/plugins/madde/maemodeviceconfigwizard.cpp
index 493eaca1a15..6572072166f 100644
--- a/src/plugins/madde/maemodeviceconfigwizard.cpp
+++ b/src/plugins/madde/maemodeviceconfigwizard.cpp
@@ -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;