diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-18 21:06:39 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-18 21:06:39 (GMT) |
| commit | 11815c63abeaf2b768e0cf59a83b53ff2b160b05 (patch) | |
| tree | 87b2d7bde7040db0aceb402a2d4486e014d8b08e /tests/auto/qmake/testcompiler.cpp | |
| parent | 8dc9f77250dfb11b2a7198b931e284e0f3d112e4 (diff) | |
| parent | 44edbab6f4063565d74f8ebf9ccdacabed5ef5ba (diff) | |
| download | Qt-11815c63abeaf2b768e0cf59a83b53ff2b160b05.zip Qt-11815c63abeaf2b768e0cf59a83b53ff2b160b05.tar.gz Qt-11815c63abeaf2b768e0cf59a83b53ff2b160b05.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 'tests/auto/qmake/testcompiler.cpp')
0 files changed, 0 insertions, 0 deletions