diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-04-17 14:26:30 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-04-17 14:26:30 (GMT) |
| commit | 9f262b977d99a4b2729cc3c17ee60f244a15f67d (patch) | |
| tree | 1bc62afe28154d5a22f2ddd17df447e1eb1ddb94 | |
| parent | 81c7a8b453726bb4aff11f2382284fc144eeda78 (diff) | |
| parent | 3e4a8153da6c05e11d8bb26f15b7ab4806e0902b (diff) | |
| download | Qt-9f262b977d99a4b2729cc3c17ee60f244a15f67d.zip Qt-9f262b977d99a4b2729cc3c17ee60f244a15f67d.tar.gz Qt-9f262b977d99a4b2729cc3c17ee60f244a15f67d.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
| -rw-r--r-- | tests/auto/qmenu/tst_qmenu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qmenu/tst_qmenu.cpp b/tests/auto/qmenu/tst_qmenu.cpp index a86b754..5b6e54c 100644 --- a/tests/auto/qmenu/tst_qmenu.cpp +++ b/tests/auto/qmenu/tst_qmenu.cpp @@ -684,7 +684,7 @@ void tst_QMenu::task250673_activeMutliColumnSubMenuPosition() class MyMenu : public QMenu { public: - friend class tst_QMenu; + int columnCount() const { return QMenu::columnCount(); } }; QMenu sub; |