diff options
author | Gunnar Sletta <gunnar@trolltech.com> | 2009-09-22 13:35:26 (GMT) |
---|---|---|
committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-09-22 13:35:26 (GMT) |
commit | 553e7512fd4a1e145582fb272a8f71ad28dd4f00 (patch) | |
tree | 01a126f6f4cc6e23f87ad40ae249f31a902a846b /src | |
parent | 16af209f76074553c6f56b3cd0da3610a71410ab (diff) | |
parent | 03bbfb0852fd18851e2c41ad1305c60d82f835e2 (diff) | |
download | Qt-553e7512fd4a1e145582fb272a8f71ad28dd4f00.zip Qt-553e7512fd4a1e145582fb272a8f71ad28dd4f00.tar.gz Qt-553e7512fd4a1e145582fb272a8f71ad28dd4f00.tar.bz2 |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src')
-rw-r--r-- | src/script/script.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/script.pro b/src/script/script.pro index 860080d..c844d89 100644 --- a/src/script/script.pro +++ b/src/script/script.pro @@ -1,7 +1,7 @@ TARGET = QtScript QPRO_PWD = $$PWD QT = core -DEFINES += JSC=QTJSC +DEFINES += JSC=QTJSC jscyyparse=qtjscyyparse jscyylex=qtjscyylex jscyyerror=qtjscyyerror DEFINES += QT_BUILD_SCRIPT_LIB DEFINES += QT_NO_USING_NAMESPACE DEFINES += QLALR_NO_QSCRIPTGRAMMAR_DEBUG_INFO |