diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-25 23:06:36 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-25 23:06:36 (GMT) |
| commit | 8484fc497f9d02b708cb23adb8ab6102d63a7753 (patch) | |
| tree | eb6aacda7fda551bcfbcfd6b0d192b2389bd094e /tests/auto/auto.pro | |
| parent | 314c6ec54e4cb4e2ec936ada7e0a112a60b87832 (diff) | |
| parent | 1470504e15662acf37bacc58359527f88efc43ab (diff) | |
| download | Qt-8484fc497f9d02b708cb23adb8ab6102d63a7753.zip Qt-8484fc497f9d02b708cb23adb8ab6102d63a7753.tar.gz Qt-8484fc497f9d02b708cb23adb8ab6102d63a7753.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
configure
configure.exe
mkspecs/features/qt.prf
tools/configure/configureapp.cpp
Diffstat (limited to 'tests/auto/auto.pro')
| -rw-r--r-- | tests/auto/auto.pro | 45 |
1 files changed, 29 insertions, 16 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index eae873d..e8add04 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,3 +1,4 @@ +QT = core TEMPLATE = subdirs # Directories @@ -7,7 +8,7 @@ TEMPLATE = subdirs SUBDIRS += \ bic \ collections \ - compile \ + compiler \ compilerwarnings \ exceptionsafety \ linguist \ @@ -71,6 +72,8 @@ SUBDIRS += \ qabstractsocket \ qabstractspinbox \ qabstracttextdocumentlayout \ + qabstractvideobuffer \ + qabstractvideosurface \ qaccessibility \ qaction \ qactiongroup \ @@ -134,9 +137,12 @@ SUBDIRS += \ qgetputenv \ qgl \ qglobal \ + qgraphicseffect \ + qgraphicseffectsource \ qgraphicsgridlayout \ qgraphicsitem \ qgraphicsitemanimation \ + qgraphicsanchorlayout \ qgraphicslayout \ qgraphicslayoutitem \ qgraphicslinearlayout \ @@ -178,7 +184,6 @@ SUBDIRS += \ qitemmodel \ qitemselectionmodel \ qitemview \ - qkeyevent \ qkeysequence \ qlabel \ qlayout \ @@ -252,19 +257,7 @@ SUBDIRS += \ qregion \ qresourceengine \ qringbuffer \ - qscriptable \ - qscriptclass \ - qscriptcontext \ - qscriptcontextinfo \ - qscriptengine \ - qscriptengineagent \ - qscriptextqobject \ - qscriptjstestsuite \ - qscriptv8testsuite \ - qscriptstring \ - qscriptvalue \ - qscriptvalueiterator \ - qscriptenginedebugger \ + qscopedpointer \ qscrollarea \ qsemaphore \ qsharedpointer \ @@ -312,7 +305,10 @@ SUBDIRS += \ qstatusbar \ qstl \ qstring \ - qstringbuilder \ + qstringbuilder1 \ + qstringbuilder2 \ + qstringbuilder3 \ + qstringbuilder4 \ qstringmatcher \ qstringlist \ qstringlistmodel \ @@ -374,6 +370,8 @@ SUBDIRS += \ qvariant \ qvarlengtharray \ qvector \ + qvideoframe \ + qvideosurfaceformat \ qvectornd \ qwaitcondition \ qwidget \ @@ -473,6 +471,21 @@ unix:!embedded:contains(QT_CONFIG, dbus):SUBDIRS += \ qdbusthreading \ qdbusxmlparser +contains(QT_CONFIG, script): SUBDIRS += \ + qscriptable \ + qscriptclass \ + qscriptcontext \ + qscriptcontextinfo \ + qscriptengine \ + qscriptengineagent \ + qscriptextqobject \ + qscriptjstestsuite \ + qscriptv8testsuite \ + qscriptstring \ + qscriptvalue \ + qscriptvalueiterator \ + qscriptenginedebugger + contains(QT_CONFIG, webkit): SUBDIRS += \ qwebframe \ qwebpage \ |