diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-15 12:24:04 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-15 13:33:05 +0200 |
| commit | 3d44bf7ce2a45d461f1d74a3f1dbdff313845898 (patch) | |
| tree | aaf8d00a16cf8173a372e3b7bc856a3fb5eb1c42 | |
| parent | f200e303829106db6e3ff32e0c492d2677531c33 (diff) | |
| parent | 86ee61734e0331459f9cfeb1ad56f773b7e994be (diff) | |
| download | qtscript-3d44bf7ce2a45d461f1d74a3f1dbdff313845898.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into devv5.10.0-beta1v5.10.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I3096cfb19971b774e1c1e320c8c99f7a52b4fd2c
| -rw-r--r-- | src/3rdparty/javascriptcore/qt_attribution.json | 3 | ||||
| -rw-r--r-- | src/script/script.pro | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/3rdparty/javascriptcore/qt_attribution.json b/src/3rdparty/javascriptcore/qt_attribution.json index 8aa031d..d3fcf52 100644 --- a/src/3rdparty/javascriptcore/qt_attribution.json +++ b/src/3rdparty/javascriptcore/qt_attribution.json @@ -11,9 +11,8 @@ "LicenseFile": "JavaScriptCore/COPYING.LIB", "Copyright": "Copyright 2006-2008 the V8 project authors. Copyright 2009, The Android Open Source Project -Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +Copyright (C) 1984, 1989, 1990, 1991, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. Copyright (C) 1991, 2000, 2001 by Lucent Technologies. -Copyright (C) 1991 Free Software Foundation, Inc. Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura, Copyright (C) 1997-2006 University of Cambridge Copyright (C) 1998 John E. Bossom diff --git a/src/script/script.pro b/src/script/script.pro index e9f15e2..cedc173 100644 --- a/src/script/script.pro +++ b/src/script/script.pro @@ -58,3 +58,6 @@ integrity { TR_EXCLUDE = $$WEBKITDIR/* load(qt_module) +# Override the module default, as it breaks compilation with libc++>=5.0: +# auto_ptr is no longer part of the c++1z standard. +CONFIG -= c++1z |