diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-23 11:25:19 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-23 11:25:20 +0100 |
| commit | aced58b77e9c91c98ac2ed60a2219d87fdc6c074 (patch) | |
| tree | 9502c37f48049de21cc2479e16c93f99df3ab0ef /Source/JavaScriptCore | |
| parent | 8e024693674da7f298339a31d7483f1ec8c9a549 (diff) | |
| parent | 4a25f710d417f57507f840ad758f8ad2a3629c6e (diff) | |
| download | qtwebkit-aced58b77e9c91c98ac2ed60a2219d87fdc6c074.tar.gz | |
Merge dev into 5.5
Change-Id: I1a4e088f1080851e768f41551b69e62267782fd9
Diffstat (limited to 'Source/JavaScriptCore')
| -rw-r--r-- | Source/JavaScriptCore/API/JSStringRefQt.cpp | 2 | ||||
| -rw-r--r-- | Source/JavaScriptCore/API/JSStringRefQt.h | 2 | ||||
| -rw-r--r-- | Source/JavaScriptCore/jit/JITStubsMSVC64.asm | 2 | ||||
| -rw-r--r-- | Source/JavaScriptCore/offlineasm/x86.rb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Source/JavaScriptCore/API/JSStringRefQt.cpp b/Source/JavaScriptCore/API/JSStringRefQt.cpp index 259bad8e6..c1ce761f7 100644 --- a/Source/JavaScriptCore/API/JSStringRefQt.cpp +++ b/Source/JavaScriptCore/API/JSStringRefQt.cpp @@ -1,6 +1,6 @@ /* * Copyright (C) 2006, 2007 Apple Computer, Inc. All rights reserved. - * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/Source/JavaScriptCore/API/JSStringRefQt.h b/Source/JavaScriptCore/API/JSStringRefQt.h index 63a059fdb..b4f934a3b 100644 --- a/Source/JavaScriptCore/API/JSStringRefQt.h +++ b/Source/JavaScriptCore/API/JSStringRefQt.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2006, 2007 Apple Computer, Inc. All rights reserved. - * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + * Copyright (C) 2015 The Qt Company Ltd. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/Source/JavaScriptCore/jit/JITStubsMSVC64.asm b/Source/JavaScriptCore/jit/JITStubsMSVC64.asm index 4a00e0d14..054214153 100644 --- a/Source/JavaScriptCore/jit/JITStubsMSVC64.asm +++ b/Source/JavaScriptCore/jit/JITStubsMSVC64.asm @@ -1,5 +1,5 @@ ;/* -; Copyright (C) 2013 Digia Plc. and/or its subsidiary(-ies) +; Copyright (C) 2015 The Qt Company Ltd ; ; Redistribution and use in source and binary forms, with or without ; modification, are permitted provided that the following conditions diff --git a/Source/JavaScriptCore/offlineasm/x86.rb b/Source/JavaScriptCore/offlineasm/x86.rb index 5e040ba76..ac433f36b 100644 --- a/Source/JavaScriptCore/offlineasm/x86.rb +++ b/Source/JavaScriptCore/offlineasm/x86.rb @@ -1,5 +1,5 @@ # Copyright (C) 2012 Apple Inc. All rights reserved. -# Copyright (C) 2013 Digia Plc. and/or its subsidiary(-ies) +# Copyright (C) 2015 The Qt Company Ltd # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions |