From 3f724e1c6acb9d8ad7fc4c4c30bad77cd3d1c907 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <danimo@owncloud.com>
Date: Mon, 26 May 2014 09:36:59 +0200
Subject: [PATCH] Fix Pref window for good

This was forgotten in 18677dbc3fad086f9a0a8c129d37a8799d1c65e0
---
 src/mirall/utility.cpp | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/mirall/utility.cpp b/src/mirall/utility.cpp
index 96645340f..1b7b3eeaa 100644
--- a/src/mirall/utility.cpp
+++ b/src/mirall/utility.cpp
@@ -167,22 +167,11 @@ QByteArray Utility::userAgentString()
 void Utility::raiseDialog( QWidget *raiseWidget )
 {
 #ifndef TOKEN_AUTH_ONLY
-    // viel hilft viel ;-)
-    if( raiseWidget ) {
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) && \
-    (defined(Q_OS_WIN) || defined (Q_OS_MAC))
-        Qt::WindowFlags eFlags = raiseWidget->windowFlags();
-        if (!(eFlags & Qt::WindowStaysOnTopHint)) {
-            eFlags |= Qt::WindowStaysOnTopHint;
-            raiseWidget->setWindowFlags(eFlags);
-            raiseWidget->show();
-            eFlags &= ~Qt::WindowStaysOnTopHint;
-            raiseWidget->setWindowFlags(eFlags);
-        }
-#endif
-        raiseWidget->show();
-        raiseWidget->raise();
-        raiseWidget->activateWindow();
+    if( raiseWidget && raiseWidget->parentWidget() == 0) {
+        raiseWidget->hide();
+        // Qt has a bug which causes parent-less dialogs to pop-under.
+        raiseWidget->setWindowFlags(raiseWidget->windowFlags() & ~Qt::Dialog);
+        raiseWidget->showNormal();
     }
 #endif
 }