equal
deleted
inserted
replaced
37 INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/os-wince |
37 INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/os-wince |
38 INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/os-win32 |
38 INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/os-win32 |
39 LIBS += -lmmtimer |
39 LIBS += -lmmtimer |
40 } |
40 } |
41 |
41 |
|
42 mac { |
|
43 DEFINES += ENABLE_JSC_MULTIPLE_THREADS=0 |
|
44 LIBS_PRIVATE += -framework AppKit |
|
45 } |
|
46 |
42 include($$WEBKITDIR/JavaScriptCore/JavaScriptCore.pri) |
47 include($$WEBKITDIR/JavaScriptCore/JavaScriptCore.pri) |
43 |
48 |
44 INCLUDEPATH += $$WEBKITDIR/JavaScriptCore |
49 INCLUDEPATH += $$WEBKITDIR/JavaScriptCore |
45 INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/parser |
50 INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/parser |
46 INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/bytecompiler |
51 INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/bytecompiler |
66 CONFIG -= separate_debug_info |
71 CONFIG -= separate_debug_info |
67 CONFIG += no_debug_info |
72 CONFIG += no_debug_info |
68 } |
73 } |
69 |
74 |
70 # Avoid JSC C API functions being exported. |
75 # Avoid JSC C API functions being exported. |
71 DEFINES += JS_EXPORT="" JS_EXPORTDATA="" |
76 DEFINES += JS_NO_EXPORT |
72 |
77 |
73 INCLUDEPATH += $$PWD |
78 INCLUDEPATH += $$PWD |
74 |
79 |
75 include(script.pri) |
80 include(script.pri) |
76 |
81 |
79 # :QTP:Fix header file clashes |
84 # :QTP:Fix header file clashes |
80 symbian: { |
85 symbian: { |
81 MMP_RULES += "USERINCLUDE ../3rdparty/javascriptcore/JavaScriptCore/profiler" |
86 MMP_RULES += "USERINCLUDE ../3rdparty/javascriptcore/JavaScriptCore/profiler" |
82 } |
87 } |
83 |
88 |
|
89 # WebKit doesn't compile in C++0x mode |
|
90 *-g++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x |
84 |
91 |