diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-25 10:23:01 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-25 10:23:01 +0200 |
| commit | 7c471bde498c07f03acc612d5f132b904bc3870e (patch) | |
| tree | 136805e93f9b781c6900f5efaa0bd6ce2301b68d /tests/auto/qmenu | |
| parent | 55664a0ef4b88b67c9931c7d2f6853e5fa0a9716 (diff) | |
| parent | 6f6909ac6681ed614f00998a0d43b7b195dbb90b (diff) | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
demos/spectrum/app/app.pro
src/gui/egl/qegl.cpp
tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
tests/auto/qmenu/tst_qmenu.cpp
Diffstat (limited to 'tests/auto/qmenu')
| -rw-r--r-- | tests/auto/qmenu/tst_qmenu.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/auto/qmenu/tst_qmenu.cpp b/tests/auto/qmenu/tst_qmenu.cpp index b6bdb36a96..7065b13254 100644 --- a/tests/auto/qmenu/tst_qmenu.cpp +++ b/tests/auto/qmenu/tst_qmenu.cpp @@ -969,8 +969,6 @@ void tst_QMenu::QTBUG7411_submenus_activate() QTRY_VERIFY(sub1.isVisible()); } - - class MyMenu : public QMenu { Q_OBJECT |