From cfd98763a1d051238382b77975567da0c0562ade Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete@nokia.com>
Date: Mon, 7 Dec 2009 10:58:58 +0100
Subject: Fix programming error in autotest commit 8529a8cbb

setWindowFlags() resets the flags, so the previous version only worked
on X11.
---
 tests/auto/qmenu/tst_qmenu.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/auto/qmenu/tst_qmenu.cpp b/tests/auto/qmenu/tst_qmenu.cpp
index 6079189..af10ad1 100644
--- a/tests/auto/qmenu/tst_qmenu.cpp
+++ b/tests/auto/qmenu/tst_qmenu.cpp
@@ -910,8 +910,7 @@ void tst_QMenu::deleteActionInTriggered()
 void tst_QMenu::pushButtonPopulateOnAboutToShow()
 {
     QPushButton b("Test PushButton");
-    b.setWindowFlags(Qt::FramelessWindowHint);
-    b.setWindowFlags(Qt::X11BypassWindowManagerHint);
+    b.setWindowFlags(Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint);
     lastMenu = new QMenu;
     b.setMenu(lastMenu);
     const int scrNumber = QApplication::desktop()->screenNumber(&b);
-- 
cgit v0.12