diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-17 18:11:50 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-17 18:11:50 (GMT) |
| commit | fd826d4a885fdbef00727b900a44b185343eb824 (patch) | |
| tree | 15d078b5348709d449402d13e401db0eb70ae72b /src/imports | |
| parent | 90272f30899bafcf30aa649e44804fcd12bb7fbd (diff) | |
| parent | 0f9cbfc6124b331d006b396d56ad5ae0e6d548e0 (diff) | |
| download | Qt-fd826d4a885fdbef00727b900a44b185343eb824.zip Qt-fd826d4a885fdbef00727b900a44b185343eb824.tar.gz Qt-fd826d4a885fdbef00727b900a44b185343eb824.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
qRound: do not do operation with double when qreal is float
Fix the warnings when QBasicTimer are member of the ObjectPrivate
Diffstat (limited to 'src/imports')
0 files changed, 0 insertions, 0 deletions