diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-13 04:39:02 +1000 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-13 04:39:02 +1000 |
commit | f6d9a717946422d910ec9e680197617eb706410c (patch) | |
tree | aa352c7e64efc5e22e27e1e336d3baeed3ce916d /doc/src/snippets/code/src_script_qscriptvalueiterator.cpp | |
parent | 150df2037f392225771f94b39f7a340d7c154de7 (diff) | |
parent | b7b9a22ce263fcb430ff4228fb88ca5229a6e226 (diff) | |
download | qt4-tools-f6d9a717946422d910ec9e680197617eb706410c.tar.gz |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Clear confusion between QMainWindow and QMainWindowLayout.
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptvalueiterator.cpp')
0 files changed, 0 insertions, 0 deletions