diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-18 10:47:45 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-18 10:47:45 (GMT) |
| commit | 62729b8eaa35c620143f79c0b244e295c3eddbca (patch) | |
| tree | a9cdae1d671fe21b2642f04c906e720c6f2ff16c /doc/src/snippets/code/src_script_qscriptable.cpp | |
| parent | 33f8a90c303fc19426183b30824d5eba24e5d104 (diff) | |
| parent | 8514c4068ec81628738f1c0ef28d156fa71f4bc4 (diff) | |
| download | Qt-62729b8eaa35c620143f79c0b244e295c3eddbca.zip Qt-62729b8eaa35c620143f79c0b244e295c3eddbca.tar.gz Qt-62729b8eaa35c620143f79c0b244e295c3eddbca.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Revert "Add a warning about trying to release a timer ID that isn't active"
Some unit tests for layout explosion thingy
Fix a bug that got revealed by 604c51f1fc5c79b7fad12cda911b06b9e6e5005f
Build failure fix (related to QT-4079)
QWidgets support for VGA screen
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptable.cpp')
0 files changed, 0 insertions, 0 deletions