diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-19 08:56:03 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-19 08:56:03 (GMT) |
| commit | 8485052e3991aebf7c823b3e80fc06ccf9f08991 (patch) | |
| tree | dcb2db231d640bc9327fe625353fa1e43fcb572d /src/corelib/kernel | |
| parent | 685df07ff7e357f6848c50cffa311641afdca307 (diff) | |
| parent | 6c121991f85164d257208b14845c7ff913a687f4 (diff) | |
| download | Qt-8485052e3991aebf7c823b3e80fc06ccf9f08991.zip Qt-8485052e3991aebf7c823b3e80fc06ccf9f08991.tar.gz Qt-8485052e3991aebf7c823b3e80fc06ccf9f08991.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Make sure #ifdef'd tests still have main() function
Long live QRawFont!
Diffstat (limited to 'src/corelib/kernel')
0 files changed, 0 insertions, 0 deletions