diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2009-05-22 09:28:05 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2009-05-22 09:28:05 (GMT) |
| commit | d0ac49ec731f0781ba48f8f5d8ce04e19ce0010d (patch) | |
| tree | ba6df139b3c343bb9352423770a99f218f62bd45 /tests/auto/auto.pro | |
| parent | 72798fc4dfc1af73cde542f9017dfec5cb020173 (diff) | |
| parent | 8ad5020940f10d4ecc5c5e8b3b9656531cb84ef3 (diff) | |
| download | Qt-d0ac49ec731f0781ba48f8f5d8ce04e19ce0010d.zip Qt-d0ac49ec731f0781ba48f8f5d8ce04e19ce0010d.tar.gz Qt-d0ac49ec731f0781ba48f8f5d8ce04e19ce0010d.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animations
Conflicts:
src/corelib/kernel/kernel.pri
src/corelib/kernel/qvariant_p.h
src/corelib/tools/tools.pri
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem.h
src/gui/graphicsview/qgraphicswidget.h
src/gui/gui.pro
Diffstat (limited to 'tests/auto/auto.pro')
| -rw-r--r-- | tests/auto/auto.pro | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index f8f15a3..316a695 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -210,6 +210,7 @@ SUBDIRS += bic \ qnumeric \ qobject \ qobjectrace \ + qcontiguouscache \ qpaintengine \ qpainter \ qpainterpath \ @@ -241,6 +242,7 @@ SUBDIRS += bic \ qregexpvalidator \ qregion \ qresourceengine \ + qringbuffer \ qscriptable \ qscriptclass \ qscriptcontext \ @@ -437,3 +439,4 @@ contains(QT_CONFIG, webkit): SUBDIRS += \ qwebframe \ qwebpage +SUBDIRS += math3d |