summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-08-03 12:09:47 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-08-03 12:09:47 (GMT)
commit73956dde054abb6504c3e5609778bf16548768b9 (patch)
tree5a071389332cfe2ae20dffa2f5180d92eed59542 /dist
parentdfb56c408b2561c194922f36a0d08c2dc7c43f9b (diff)
parent57d4e5aae33d27f4989c76269f23e837b8dff451 (diff)
downloadQt-73956dde054abb6504c3e5609778bf16548768b9.zip
Qt-73956dde054abb6504c3e5609778bf16548768b9.tar.gz
Qt-73956dde054abb6504c3e5609778bf16548768b9.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Use the fast conversion from RGB888 to RGB32 for Jpeg images Move the SIMD defines to the common declaration of Qt symbols Fixed: QT_DEPRECATED_WARNINGS defines QT3_SUPPORT
Diffstat (limited to 'dist')
0 files changed, 0 insertions, 0 deletions