diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-09 23:27:07 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-09 23:27:07 (GMT) |
commit | f3ddd2d995b7485cdc1c3420d254499904ff9dd9 (patch) | |
tree | 011f0e0ede59d948adc908370ff2daff171f1203 /src/gui/styles/qcommonstylepixmaps_p.h | |
parent | dbc9841033ba0d27048bddaa83dee24673ae2761 (diff) | |
parent | 76ac26383922b4c452592a9175e7f3b9b3fd2513 (diff) | |
download | Qt-f3ddd2d995b7485cdc1c3420d254499904ff9dd9.zip Qt-f3ddd2d995b7485cdc1c3420d254499904ff9dd9.tar.gz Qt-f3ddd2d995b7485cdc1c3420d254499904ff9dd9.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
ifdef out mac/no_coreservices path more cleanly
fix build on symbian
Diffstat (limited to 'src/gui/styles/qcommonstylepixmaps_p.h')
0 files changed, 0 insertions, 0 deletions