diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-21 18:12:43 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-21 18:12:43 (GMT) |
| commit | d37a3529ec883985b2967265f0797d749db74308 (patch) | |
| tree | 9e0b47203b07736d7ec2a34a5d866f93fba73449 /demos/qmediaplayer/mediaplayer.cpp | |
| parent | ea48f884704162265791aa14c5d3e1ef4f8ddb4e (diff) | |
| parent | 2a340b56c9935ee25bbd0b750d1239cb14051b27 (diff) | |
| download | Qt-d37a3529ec883985b2967265f0797d749db74308.zip Qt-d37a3529ec883985b2967265f0797d749db74308.tar.gz Qt-d37a3529ec883985b2967265f0797d749db74308.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed PREPEND_INCLUDEPATH being executed too early.
Moved the default dependency targets to default_post.prf.
Fixed autotest.
get rid of QPrinterInfoPrivate::isNull member
QPrinterInfo::supportedPaperSizes(): return early if the info is invalid
fix QPrinterInfo::defaultPrinter() on win
micro-optimizations, clean-ups and styling fixes
refactoring of QPrinterInfo
minor refactoring of QPrinterInfoPrivate
use binary search int the string2PaperSize() helper
Diffstat (limited to 'demos/qmediaplayer/mediaplayer.cpp')
0 files changed, 0 insertions, 0 deletions