diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-03 11:46:09 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-03 11:46:09 (GMT) |
commit | 1d5041c712acd10020c38a92f1eedc88368ca19f (patch) | |
tree | fb2d4e31c8232456d10bd70a67000076c8d2d48a /tests/auto/qmenubar | |
parent | 68ad4618e02d1686e37b979fbf1fd1f349aa6d4f (diff) | |
parent | 7f5797a784e237672f291055020ef4bbb6199893 (diff) | |
download | Qt-4.8.0-beta.zip Qt-4.8.0-beta.tar.gz Qt-4.8.0-beta.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integrationv4.8.0-beta
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Doc: Fixing typo
Diffstat (limited to 'tests/auto/qmenubar')
-rw-r--r-- | tests/auto/qmenubar/tst_qmenubar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qmenubar/tst_qmenubar.cpp b/tests/auto/qmenubar/tst_qmenubar.cpp index d548a51..ccfb670 100644 --- a/tests/auto/qmenubar/tst_qmenubar.cpp +++ b/tests/auto/qmenubar/tst_qmenubar.cpp @@ -250,7 +250,7 @@ const int RESET = 0; /*! Test plan: - insertItem (all flavours and combinations) + insertItem (all flavors and combinations) removing menu items clearing the menu |