diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-11 19:28:09 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-11 19:28:09 (GMT) |
| commit | 9de173661019a5eb819ff75a43c1261a3b60e005 (patch) | |
| tree | 1fd55b98efceb4c9264e68ee1bab2df64c9fd91b /src/testlib/qbenchmarkmetric.h | |
| parent | d6c53b573f317ff5ea2c420ac1daad57bf1565d7 (diff) | |
| parent | 405b55e497120187b9d127f902a5009d0c9430bf (diff) | |
| download | Qt-9de173661019a5eb819ff75a43c1261a3b60e005.zip Qt-9de173661019a5eb819ff75a43c1261a3b60e005.tar.gz Qt-9de173661019a5eb819ff75a43c1261a3b60e005.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Making the hybrid allocator change compatible across all 4.7.x
Spectrum demo: only use --rpath for linux-g++* mkspecs
Spectrum demo: put binaries into correct locations on Windows
Designer: Fix a crash when copying empty page-based containers.
Diffstat (limited to 'src/testlib/qbenchmarkmetric.h')
0 files changed, 0 insertions, 0 deletions