diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-06-25 15:49:53 +0200 |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-06-25 15:49:53 +0200 |
| commit | db8f05e257019694f5e8076845626008f2adc3dd (patch) | |
| tree | 05d3959403cf15ac5f702091439e028af01f343b /tests/auto/auto.pro | |
| parent | 8aafaa65a1d16f8b982279f5aceedf1e281ddb5a (diff) | |
| parent | 796a5a2c7d8c91a46ac761dde18b7da2ec6c177b (diff) | |
Merge commit 'qt/master-stable' into 4.6-stable
Bring Qt 4.6 into the Qt-S60 repo.
Conflicts:
configure.exe
mkspecs/features/qttest_p4.prf
qmake/generators/makefile.cpp
src/corelib/io/qdir.cpp
src/corelib/io/qprocess.h
src/corelib/kernel/qcoreevent.h
src/corelib/kernel/qobject.cpp
src/corelib/kernel/qsharedmemory_unix.cpp
src/corelib/thread/qthread_p.h
src/corelib/tools/qvector.h
src/gui/dialogs/qdialog.cpp
src/gui/dialogs/qfiledialog.cpp
src/gui/dialogs/qfiledialog_p.h
src/gui/dialogs/qmessagebox.cpp
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsview.cpp
src/gui/image/qpixmapcache.cpp
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication_p.h
src/gui/kernel/qwidget.cpp
src/gui/kernel/qwidget_p.h
src/gui/painting/qdrawhelper.cpp
src/gui/painting/qpaintengine_raster.cpp
src/gui/text/qfontengine_qpf.cpp
src/gui/widgets/qmenubar.cpp
src/network/socket/qlocalserver.cpp
src/testlib/qtestcase.cpp
src/testlib/testlib.pro
tests/auto/qimagereader/tst_qimagereader.cpp
tests/auto/qitemdelegate/tst_qitemdelegate.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
tests/auto/qpixmap/qpixmap.pro
Diffstat (limited to 'tests/auto/auto.pro')
| -rw-r--r-- | tests/auto/auto.pro | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 178351b617..19d7924720 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -77,6 +77,7 @@ SUBDIRS += _networkselftest \ qaction \ qactiongroup \ qalgorithms \ + qanimationgroup \ qapplication \ qatomicint \ qatomicpointer \ @@ -141,9 +142,17 @@ SUBDIRS += _networkselftest \ qglobal \ qgraphicsitem \ qgraphicsitemanimation \ + qgraphicslayout \ + qgraphicslayoutitem \ + qgraphicslinearlayout \ + qgraphicsobject \ + qgraphicspixmapitem \ + qgraphicspolygonitem \ + qgraphicsproxywidget \ qgraphicsscene \ qgraphicsview \ - qgridlayout \ + qgraphicswidget \ + qgridlayout \ qgroupbox \ qguivariant \ qhash \ @@ -211,10 +220,12 @@ SUBDIRS += _networkselftest \ qnumeric \ qobject \ qobjectrace \ + qcontiguouscache \ qpaintengine \ qpainter \ qpainterpath \ qpalette \ + qparallelanimationgroup \ qpathclipper \ qpen \ qpicture \ @@ -230,6 +241,7 @@ SUBDIRS += _networkselftest \ qprocess \ qprogressbar \ qprogressdialog \ + qpropertyanimation \ qpushbutton \ qscopedpointer \ qqueue \ @@ -241,6 +253,7 @@ SUBDIRS += _networkselftest \ qregexpvalidator \ qregion \ qresourceengine \ + qringbuffer \ qscriptable \ qscriptclass \ qscriptcontext \ @@ -257,6 +270,7 @@ SUBDIRS += _networkselftest \ qscrollarea \ qsemaphore \ qsharedpointer \ + qsequentialanimationgroup \ qset \ qsettings \ qshortcut \ @@ -290,6 +304,8 @@ SUBDIRS += _networkselftest \ qstackedwidget \ qstandarditem \ qstandarditemmodel \ + qstate \ + qstatemachine \ qstatusbar \ qstl \ qstring \ @@ -434,3 +450,4 @@ contains(QT_CONFIG, webkit): SUBDIRS += \ qwebframe \ qwebpage +SUBDIRS += math3d |