diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-17 21:33:30 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-17 21:33:30 (GMT) |
commit | 8514c4068ec81628738f1c0ef28d156fa71f4bc4 (patch) | |
tree | 5a829199c445b1b827436472f2dc445191246a5a /config.tests | |
parent | f612cb0f6bf4dd06fa344b1a5862985209fa5533 (diff) | |
parent | 0cfda20a6dc0d1072cfb2c58e6d1ed7c9308ac14 (diff) | |
download | Qt-8514c4068ec81628738f1c0ef28d156fa71f4bc4.zip Qt-8514c4068ec81628738f1c0ef28d156fa71f4bc4.tar.gz Qt-8514c4068ec81628738f1c0ef28d156fa71f4bc4.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 'config.tests')
0 files changed, 0 insertions, 0 deletions