Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1

Conflicts:
	.qmake.conf

Change-Id: I593c05d4dd860dd24ef13d446c700a65d96496f3

1 files changed, 64 insertions, 0 deletions

diff --git a/tests/benchmarks/script/sunspider/tests/LICENSE.txt b/tests/benchmarks/script/sunspider/tests/LICENSE.txt
new file mode 100644
index 0000000..3d93447
--- /dev/null
+++ b/tests/benchmarks/script/sunspider/tests/LICENSE.txt
@@ -0,0 +1,64 @@
+Copyright (C) 2007, 2013 Apple Inc. All rights reserved.
+Copyright (C) Rich Moore.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+
+string-unpack-code.js contains code from jQuery 1.2.1 - New Wave Javascript:
+
+Copyright (c) 2007 John Resig (jquery.com)
+Dual licensed under the MIT (MIT-LICENSE.txt)
+and GPL (GPL-LICENSE.txt) licenses.
+
+and
+
+Copyright (c) 2004-2007, The Dojo Foundation
+All Rights Reserved.
+
+Licensed under the Academic Free License version 2.1 or above OR the
+modified BSD license. For more information on Dojo licensing, see:
+
+http://dojotoolkit.org/community/licensing.shtml
+
+and
+
+Prototype 1.5 rc0
+ - Adapted from Ruby on Rails - http://dev.rubyonrails.org/browser/spinoffs/prototype/src
+ - By Lunarmedia, 06 August, 2006
+ - Available at (and packed with) JavascriptCompressor.com
+
+
+string-tagcloud.js contains code from json.js 2007-10-10, placed in the Public Domain
+
+
+string-base64.js contains code licensed under MPL 1.1 OR GPL 2.0 OR LGPL 2.1
+The Initial Developer of the Original Code is Digital Creations 2, Inc.
+Portions created by the Initial Developer are Copyright (C) 2000
+the Initial Developer. All Rights Reserved.
+
+Contributor(s):
+*   Martijn Pieters <mj@digicool.com> (original author)
+*   Samuel Sieb <samuel@sieb.net>
+
+
+date-format-xparb.js is licensed under the LGPL v2.1.