diff -r 56cd8111b7f7 -r 41300fa6a67c src/script/script.pro --- a/src/script/script.pro Tue Jan 26 12:42:25 2010 +0200 +++ b/src/script/script.pro Tue Feb 02 00:43:10 2010 +0200 @@ -1,7 +1,7 @@ TARGET = QtScript QPRO_PWD = $$PWD QT = core -DEFINES += JSC=QTJSC jscyyparse=qtjscyyparse jscyylex=qtjscyylex jscyyerror=qtjscyyerror +DEFINES += JSC=QTJSC jscyyparse=qtjscyyparse jscyylex=qtjscyylex jscyyerror=qtjscyyerror WTF=QTWTF DEFINES += QT_BUILD_SCRIPT_LIB DEFINES += QT_NO_USING_NAMESPACE DEFINES += QLALR_NO_QSCRIPTGRAMMAR_DEBUG_INFO @@ -75,3 +75,10 @@ include(script.pri) symbian:TARGET.UID3=0x2001B2E1 + +# :QTP:Fix header file clashes +symbian: { + MMP_RULES += "USERINCLUDE ../3rdparty/javascriptcore/JavaScriptCore/profiler" +} + +