diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-08 23:56:32 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-08 23:56:32 (GMT) |
| commit | ff222b3ece43664a4f599c8a6b0275d2aa72cc4d (patch) | |
| tree | 0d0e8bcc20b8cf668904946d344b3b85964519fa /tests/tests.pro | |
| parent | 3b1a0c4877faa9d1d50372f2128c06530ae4b2d4 (diff) | |
| parent | de5ce297da04d1246711d28095d6cd1f52cfc97b (diff) | |
| download | Qt-ff222b3ece43664a4f599c8a6b0275d2aa72cc4d.zip Qt-ff222b3ece43664a4f599c8a6b0275d2aa72cc4d.tar.gz Qt-ff222b3ece43664a4f599c8a6b0275d2aa72cc4d.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:
Make generate uid3 (symbian) work on 64 bit host platform.
Updated the docs for QPainter::begin/endNativePainting()
Compile fix for network benchmarks.
Add a pixmap modification hook to blur pixmap filter cache
Delete benchmark examples (qtestlib-simple and qtwidgets).
Restructure tests/benchmarks directory.
Fixed QImagReader::setAutoDetectImageFormat() to work with plugins.
QLineEdit: regression: read-only line edits would eat shortcuts.
QGraphicsItem: Do not crash at exit if there is static QGraphicsItem.
Make QTextCodec reentrant.
Diffstat (limited to 'tests/tests.pro')
| -rw-r--r-- | tests/tests.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/tests.pro b/tests/tests.pro index 7fbc8a9..75ca120 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -1,2 +1,3 @@ TEMPLATE = subdirs -SUBDIRS = auto +SUBDIRS = auto \ + benchmarks |