diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-20 11:35:32 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-20 11:35:32 (GMT) |
| commit | 10ae8560f03c0e70e77420accf5233dee36c5b67 (patch) | |
| tree | 375475e51a9b41d856718373744ae828176206b8 /tests/auto/qpixmap/qpixmap.pro | |
| parent | cc4b3c0f9c66a586df67992f5b3687fbab4029d6 (diff) | |
| parent | ebcb490b3e179157a886474c86597984b346abe3 (diff) | |
| download | Qt-10ae8560f03c0e70e77420accf5233dee36c5b67.zip Qt-10ae8560f03c0e70e77420accf5233dee36c5b67.tar.gz Qt-10ae8560f03c0e70e77420accf5233dee36c5b67.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
My 4.7.0 changes
Fix a Headerview layout bug
Qt does not build with qt_namespace on macos
Add a testcase for when peeking and then reading from a QIODevice
Diffstat (limited to 'tests/auto/qpixmap/qpixmap.pro')
0 files changed, 0 insertions, 0 deletions