summaryrefslogtreecommitdiffstats
path: root/src/script
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-09-18 12:46:30 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-09-18 12:47:11 (GMT)
commit421e02d7b48b4a852a4aa1e6feb781a64f0981b4 (patch)
tree4b655f23d76d8481aabb4e2dc2d6bbe943ac36a7 /src/script
parent402ac576ec951f68eb02787515bd1f87354c35eb (diff)
downloadQt-421e02d7b48b4a852a4aa1e6feb781a64f0981b4.zip
Qt-421e02d7b48b4a852a4aa1e6feb781a64f0981b4.tar.gz
Qt-421e02d7b48b4a852a4aa1e6feb781a64f0981b4.tar.bz2
Fix symbol clashes between QtWebKit and QtScript
Rename the JSC namespace to QTJSC. Reviewed-by: Lars Knoll
Diffstat (limited to 'src/script')
-rw-r--r--src/script/script.pro1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/script/script.pro b/src/script/script.pro
index e59b2e7..860080d 100644
--- a/src/script/script.pro
+++ b/src/script/script.pro
@@ -1,6 +1,7 @@
TARGET = QtScript
QPRO_PWD = $$PWD
QT = core
+DEFINES += JSC=QTJSC
DEFINES += QT_BUILD_SCRIPT_LIB
DEFINES += QT_NO_USING_NAMESPACE
DEFINES += QLALR_NO_QSCRIPTGRAMMAR_DEBUG_INFO