diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-21 09:23:33 +0200 |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-21 09:23:33 +0200 |
| commit | 45357546c29240b95300f392084a2fe901073d85 (patch) | |
| tree | aca89043c1bd80a3a7515402ee0fbb55b9cbf6ee /src/scripttools/scripttools.pro | |
| parent | 2e645960930442e895f887f1ef5e226d14eabcc7 (diff) | |
| parent | f11fc8f62558543dac1eca9d52a4801196c55221 (diff) | |
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 'src/scripttools/scripttools.pro')
| -rw-r--r-- | src/scripttools/scripttools.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/scripttools/scripttools.pro b/src/scripttools/scripttools.pro index 5878db2a0f..b1df7aa59d 100644 --- a/src/scripttools/scripttools.pro +++ b/src/scripttools/scripttools.pro @@ -9,6 +9,7 @@ unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtScript include(../qbase.pri) + include(debugging/debugging.pri) symbian:TARGET.UID3=0x2001E625 |