diff options
| author | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-07-23 05:52:38 (GMT) |
|---|---|---|
| committer | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-07-23 06:59:55 (GMT) |
| commit | 5234d083c9b00ed508dae7cc8c47d21da46325c6 (patch) | |
| tree | 738a0b5b6f2e73c91dac62e2094a17b66f454c0d /doc/src/snippets/code/src_script_qscriptvalueiterator.cpp | |
| parent | 3f630677d415d4a67938fa6cf64754c80aa30ba0 (diff) | |
| download | Qt-5234d083c9b00ed508dae7cc8c47d21da46325c6.zip Qt-5234d083c9b00ed508dae7cc8c47d21da46325c6.tar.gz Qt-5234d083c9b00ed508dae7cc8c47d21da46325c6.tar.bz2 | |
Fix merge error, restore size of bit field.
Change 34fde4a4 removes one bit from the flags bitfield, which was
added in change 7bc98d7b. This happened during resolving of a
merge conflict and caused some input method related autotests in
tst_QGraphicsView to fail.
Reviewed-by: mbm
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptvalueiterator.cpp')
0 files changed, 0 insertions, 0 deletions