summaryrefslogtreecommitdiffstats
path: root/tests/benchmarks/qimagereader/images/test.ppm
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-10 00:15:12 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-10 00:15:12 (GMT)
commit4a5e8e026bed24d451e2d36f490f42a17ed74b47 (patch)
tree642eaf971a216c3dea6169979de89f7624559dce /tests/benchmarks/qimagereader/images/test.ppm
parent6165ab0203fa80d31f3488ead7e7f7c088c8668c (diff)
parent2a1bf99770401576f451806b2e2a8c73853ca99b (diff)
downloadQt-4a5e8e026bed24d451e2d36f490f42a17ed74b47.zip
Qt-4a5e8e026bed24d451e2d36f490f42a17ed74b47.tar.gz
Qt-4a5e8e026bed24d451e2d36f490f42a17ed74b47.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: Compile fix for embedded. Revised fix for system tray popup activation Fixed draggabletext example. Added new mouse cursor types. Doc: more \since 4.7 Doc: add \since 4.7 to new functions.
Diffstat (limited to 'tests/benchmarks/qimagereader/images/test.ppm')
0 files changed, 0 insertions, 0 deletions