diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-05 21:59:12 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-05 21:59:12 (GMT) |
commit | 2458cb45665b0fe3144266122f876bd541de9c42 (patch) | |
tree | 5c729240b4847c886796ca688488634aca93b42c /src/gui/image/qicon.h | |
parent | e99a9e6b8ef0521e46742fe876766a6021f0121d (diff) | |
parent | 888e05cc903c4a03a6571bb0e0befb86fd9443d5 (diff) | |
download | Qt-2458cb45665b0fe3144266122f876bd541de9c42.zip Qt-2458cb45665b0fe3144266122f876bd541de9c42.tar.gz Qt-2458cb45665b0fe3144266122f876bd541de9c42.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Compile with DirectFB version >= 1.2.0 && < 1.2.9
QDirectFBPaintEngine optimization
Add some warnings when using DISABLE/WARN in DFB
Diffstat (limited to 'src/gui/image/qicon.h')
0 files changed, 0 insertions, 0 deletions