diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-21 07:23:33 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-21 07:23:33 (GMT) |
| commit | 45357546c29240b95300f392084a2fe901073d85 (patch) | |
| tree | aca89043c1bd80a3a7515402ee0fbb55b9cbf6ee /tests/auto/auto.pro | |
| parent | 2e645960930442e895f887f1ef5e226d14eabcc7 (diff) | |
| parent | f11fc8f62558543dac1eca9d52a4801196c55221 (diff) | |
| download | Qt-45357546c29240b95300f392084a2fe901073d85.zip Qt-45357546c29240b95300f392084a2fe901073d85.tar.gz Qt-45357546c29240b95300f392084a2fe901073d85.tar.bz2 | |
Merge commit 'qt/master'
Conflicts:
configure.exe
examples/examples.pro
qmake/Makefile.unix
qmake/Makefile.win32
qmake/Makefile.win32-g++
qmake/Makefile.win32-g++-sh
qmake/qmake.pro
src/script/api/qscriptable.h
src/script/api/qscriptclasspropertyiterator.h
src/script/api/qscriptcontext.h
src/script/api/qscriptengineagent.cpp
src/script/api/qscriptstring.cpp
src/script/api/qscriptstring.h
src/script/api/qscriptvalueiterator.cpp
src/script/api/qscriptvalueiterator.h
src/script/qscriptclass.cpp
src/script/qscriptcontext.cpp
src/script/qscriptengine.cpp
src/script/qscriptengine_p.cpp
src/script/qscriptvalue.cpp
src/script/qscriptvalue_p.h
src/script/qscriptvalueimplfwd_p.h
src/script/script.pro
src/src.pro
tests/auto/auto.pro
tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
tools/configure/configureapp.cpp
Diffstat (limited to 'tests/auto/auto.pro')
| -rw-r--r-- | tests/auto/auto.pro | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index d8d5a0e..76dca51 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -253,19 +253,6 @@ SUBDIRS += \ qresourceengine \ qringbuffer \ qscopedpointer \ - qscriptable \ - qscriptclass \ - qscriptcontext \ - qscriptcontextinfo \ - qscriptengine \ - qscriptengineagent \ - qscriptextqobject \ - qscriptjstestsuite \ - qscriptv8testsuite \ - qscriptstring \ - qscriptvalue \ - qscriptvalueiterator \ - qscriptenginedebugger \ qscrollarea \ qsemaphore \ qsharedpointer \ @@ -474,6 +461,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 \ |