diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2009-12-07 09:58:58 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2009-12-07 09:58:58 (GMT) |
| commit | cfd98763a1d051238382b77975567da0c0562ade (patch) | |
| tree | cf175208d5842ddce299bffe125fa3ff9e364dde /tests/auto/qmenu | |
| parent | 8fea31ca0ab98ef6fed7bb2d87d97f4f425b2078 (diff) | |
| download | Qt-cfd98763a1d051238382b77975567da0c0562ade.zip Qt-cfd98763a1d051238382b77975567da0c0562ade.tar.gz Qt-cfd98763a1d051238382b77975567da0c0562ade.tar.bz2 | |
Fix programming error in autotest commit 8529a8cbb
setWindowFlags() resets the flags, so the previous version only worked
on X11.
Diffstat (limited to 'tests/auto/qmenu')
| -rw-r--r-- | tests/auto/qmenu/tst_qmenu.cpp | 3 |
1 files changed, 1 insertions, 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); |