diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-26 12:35:17 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-26 12:35:17 +0200 |
| commit | b8845794b95376e8be39dbdafca2c85b5ec4c195 (patch) | |
| tree | 26fa9590cc3efdfc1570e84c84182ab5545633ef /src/script | |
| parent | 6e1dde1568d5b0dd774173e3d8f63a15c9a10e15 (diff) | |
| parent | 9dc78a2d847bca5ec7b1445356523383a030d7ce (diff) | |
| download | qtscript-b8845794b95376e8be39dbdafca2c85b5ec4c195.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h
One side narrowed a QNX define to Dinkum; the other wanted the same
kludges applied for Intel. Combine their changes to the condition.
Change-Id: Id44102e53a0f96b7318437fb47fa76d8bc1119f3
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/script.pro | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/script/script.pro b/src/script/script.pro index dec4a4f..03444d2 100644 --- a/src/script/script.pro +++ b/src/script/script.pro @@ -41,27 +41,9 @@ DEFINES += LOG_DISABLED=1 include($$WEBKITDIR/JavaScriptCore/JavaScriptCore.pri) -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/parser -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/bytecompiler -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/debugger -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/runtime -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/wtf -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/unicode -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/interpreter -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/jit -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/profiler -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/wrec -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/API -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/bytecode -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/assembler -INCLUDEPATH += $$WEBKITDIR/JavaScriptCore/generated - # This line copied from WebCore.pro DEFINES += WTF_USE_JAVASCRIPTCORE_BINDINGS=1 WTF_CHANGES=1 -CONFIG(release, debug|release):DEFINES += NDEBUG - # Avoid JSC C API functions being exported. DEFINES += JS_NO_EXPORT |