diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-15 02:53:29 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-15 02:53:29 (GMT) |
commit | af1ce755f15b10a00dabf240b004eb80d4a7ded1 (patch) | |
tree | 267c14d4a9a488f9948600a8794bd394eb8d1d86 /doc/src/snippets/code/doc_src_qtscript.cpp | |
parent | e1d18217134e21be0d896ad3022ef1284d23122d (diff) | |
parent | 5f9f98ec047024fadbfdea334fbea7c357179032 (diff) | |
download | Qt-af1ce755f15b10a00dabf240b004eb80d4a7ded1.zip Qt-af1ce755f15b10a00dabf240b004eb80d4a7ded1.tar.gz Qt-af1ce755f15b10a00dabf240b004eb80d4a7ded1.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix inheritance of widget input contexts.
Diffstat (limited to 'doc/src/snippets/code/doc_src_qtscript.cpp')
0 files changed, 0 insertions, 0 deletions