diff options
| author | axis <qt-info@nokia.com> | 2009-08-19 09:24:04 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-08-19 09:24:04 (GMT) |
| commit | 2d1b49bd21b788ba3e35fc5c41bf3aab42cbda65 (patch) | |
| tree | 24dae3a4532870d61282841f6bb186cb008ab747 /tests/auto/auto.pro | |
| parent | b3a3652abbf1cb4ebba6c6257ecf47f8dc022d93 (diff) | |
| parent | 20d2b7312456435e5e1a98dba7c2cc96b44fe83c (diff) | |
| download | Qt-2d1b49bd21b788ba3e35fc5c41bf3aab42cbda65.zip Qt-2d1b49bd21b788ba3e35fc5c41bf3aab42cbda65.tar.gz Qt-2d1b49bd21b788ba3e35fc5c41bf3aab42cbda65.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
tests/auto/auto.pro
Diffstat (limited to 'tests/auto/auto.pro')
| -rw-r--r-- | tests/auto/auto.pro | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index cc9f1b9..d8d5a0e 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -194,6 +194,7 @@ SUBDIRS += \ qmainwindow \ qmake \ qmap \ + qmatrixnxn \ qmdiarea \ qmdisubwindow \ qmenu \ @@ -240,7 +241,7 @@ SUBDIRS += \ qprogressdialog \ qpropertyanimation \ qpushbutton \ - qscopedpointer \ + qquaternion \ qqueue \ qradiobutton \ qreadlocker \ @@ -251,6 +252,7 @@ SUBDIRS += \ qregion \ qresourceengine \ qringbuffer \ + qscopedpointer \ qscriptable \ qscriptclass \ qscriptcontext \ @@ -373,6 +375,7 @@ SUBDIRS += \ qvariant \ qvarlengtharray \ qvector \ + qvectornd \ qwaitcondition \ qwidget \ qwidgetaction \ @@ -477,5 +480,3 @@ contains(QT_CONFIG, webkit): SUBDIRS += \ qwebhistoryinterface \ qwebelement \ qwebhistory - -SUBDIRS += math3d |