diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-21 15:56:57 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-21 15:56:57 +0300 |
| commit | 34679dd23213881a9632e21e4858377ff90a9006 (patch) | |
| tree | deb9ebf681d4954b2d44858ca1a14d251c31e8eb /tests/auto/auto.pro | |
| parent | 7669f91c33328505fbe52f4913bd3f8745b76d31 (diff) | |
| parent | 4aa6869877d4906fcfaac5388294748512cace25 (diff) | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Conflicts:
src/corelib/io/qfilesystemwatcher_symbian.cpp
src/corelib/io/qfilesystemwatcher_symbian_p.h
Diffstat (limited to 'tests/auto/auto.pro')
| -rw-r--r-- | tests/auto/auto.pro | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index d8d5a0eb4..772b56254 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -138,6 +138,7 @@ SUBDIRS += \ qgraphicsgridlayout \ qgraphicsitem \ qgraphicsitemanimation \ + qgraphicsanchorlayout \ qgraphicslayout \ qgraphicslayoutitem \ qgraphicslinearlayout \ @@ -253,19 +254,6 @@ SUBDIRS += \ qresourceengine \ qringbuffer \ qscopedpointer \ - qscriptable \ - qscriptclass \ - qscriptcontext \ - qscriptcontextinfo \ - qscriptengine \ - qscriptengineagent \ - qscriptextqobject \ - qscriptjstestsuite \ - qscriptv8testsuite \ - qscriptstring \ - qscriptvalue \ - qscriptvalueiterator \ - qscriptenginedebugger \ qscrollarea \ qsemaphore \ qsharedpointer \ @@ -474,6 +462,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 \ |