diff options
author | Teemu Kaukoranta <teemu.kaukoranta@digia.com> | 2013-05-22 06:10:45 (GMT) |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-10 21:57:30 (GMT) |
commit | 5a466fc74a67e6c28722c9e0d26fcf876c7a0e9b (patch) | |
tree | 9e69ae3f4ed6c357d73eabf82bccd3490ab05642 /examples | |
parent | f66df7b112b8626c5f1cbd19875d97e8c5de1f84 (diff) | |
download | Qt-5a466fc74a67e6c28722c9e0d26fcf876c7a0e9b.zip Qt-5a466fc74a67e6c28722c9e0d26fcf876c7a0e9b.tar.gz Qt-5a466fc74a67e6c28722c9e0d26fcf876c7a0e9b.tar.bz2 |
Replaced Nokia copyrights in header
Replaced old Nokia copyrights with Digia copyrights.
Removed "All rights reserved" strings without leading copyrights were
removed (for example, 'Copyright SomeCompany, all rights reserved
remain untouched).
Did NOT touch contact details, will change them later.
Excluded folders that have '3rdparty' in path.
Used command:
find . -path '*/3rdparty/*' -prune -o
-exec grep -ilI -E '.*Copyright.*Nokia.*' {} \; |
tee >(xargs sed -i -r '1,10 s/([ #*]*)(.*Copyright.*Nokia.*)/
\1Copyright \(C\) 2013 Digia Plc and\/or its subsidiary\(-ies\)\./I')
>(xargs sed -i -r '1,10 s/(^[ #*]*)(all rights reserved.*)/\1/I')
This excludes binary files and retains whitespace and #* characters in
the beginning of the edited lines.
Fixed "all rights reserved" that didn't get removed completely.
Change-Id: Iec19ee5ca4fd7e0735a234955fe1648f1f71d206
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Diffstat (limited to 'examples')
37 files changed, 73 insertions, 74 deletions
diff --git a/examples/webkit/webkit-guide/_image_assets.htm b/examples/webkit/webkit-guide/_image_assets.htm index 5640e2c..57cd75f 100644 --- a/examples/webkit/webkit-guide/_image_assets.htm +++ b/examples/webkit/webkit-guide/_image_assets.htm @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/anim_accord.htm b/examples/webkit/webkit-guide/anim_accord.htm index 9f2cf55..fb9baa1 100644 --- a/examples/webkit/webkit-guide/anim_accord.htm +++ b/examples/webkit/webkit-guide/anim_accord.htm @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/anim_demo-rotate.htm b/examples/webkit/webkit-guide/anim_demo-rotate.htm index 5856e30..25af36e 100644 --- a/examples/webkit/webkit-guide/anim_demo-rotate.htm +++ b/examples/webkit/webkit-guide/anim_demo-rotate.htm @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/anim_demo-scale.htm b/examples/webkit/webkit-guide/anim_demo-scale.htm index b1abf40..10792a1 100644 --- a/examples/webkit/webkit-guide/anim_demo-scale.htm +++ b/examples/webkit/webkit-guide/anim_demo-scale.htm @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/anim_demo-skew.htm b/examples/webkit/webkit-guide/anim_demo-skew.htm index 07c1ae3..3112974 100644 --- a/examples/webkit/webkit-guide/anim_demo-skew.htm +++ b/examples/webkit/webkit-guide/anim_demo-skew.htm @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/anim_gallery.htm b/examples/webkit/webkit-guide/anim_gallery.htm index 11a1141..f944b12 100644 --- a/examples/webkit/webkit-guide/anim_gallery.htm +++ b/examples/webkit/webkit-guide/anim_gallery.htm @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/anim_panel.htm b/examples/webkit/webkit-guide/anim_panel.htm index 04dabee..d1aa208 100644 --- a/examples/webkit/webkit-guide/anim_panel.htm +++ b/examples/webkit/webkit-guide/anim_panel.htm @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/anim_pulse.htm b/examples/webkit/webkit-guide/anim_pulse.htm index 15a47db..3fd8bc9 100644 --- a/examples/webkit/webkit-guide/anim_pulse.htm +++ b/examples/webkit/webkit-guide/anim_pulse.htm @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/anim_skew.htm b/examples/webkit/webkit-guide/anim_skew.htm index 89e5983..660004a 100644 --- a/examples/webkit/webkit-guide/anim_skew.htm +++ b/examples/webkit/webkit-guide/anim_skew.htm @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/anim_slide1.htm b/examples/webkit/webkit-guide/anim_slide1.htm index 949e041..34d3889 100644 --- a/examples/webkit/webkit-guide/anim_slide1.htm +++ b/examples/webkit/webkit-guide/anim_slide1.htm @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/anim_slide2.htm b/examples/webkit/webkit-guide/anim_slide2.htm index 0d11d9b..13e40b4 100644 --- a/examples/webkit/webkit-guide/anim_slide2.htm +++ b/examples/webkit/webkit-guide/anim_slide2.htm @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/anim_slide3.htm b/examples/webkit/webkit-guide/anim_slide3.htm index 14ffdde..3b5d1dc 100644 --- a/examples/webkit/webkit-guide/anim_slide3.htm +++ b/examples/webkit/webkit-guide/anim_slide3.htm @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/anim_tabbedSkew.htm b/examples/webkit/webkit-guide/anim_tabbedSkew.htm index b648797..b765780 100644 --- a/examples/webkit/webkit-guide/anim_tabbedSkew.htm +++ b/examples/webkit/webkit-guide/anim_tabbedSkew.htm @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/css3_backgrounds.htm b/examples/webkit/webkit-guide/css3_backgrounds.htm index f1f9306..0b0879d 100644 --- a/examples/webkit/webkit-guide/css3_backgrounds.htm +++ b/examples/webkit/webkit-guide/css3_backgrounds.htm @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/css3_border-img.htm b/examples/webkit/webkit-guide/css3_border-img.htm index b0522ac..32b1c57 100644 --- a/examples/webkit/webkit-guide/css3_border-img.htm +++ b/examples/webkit/webkit-guide/css3_border-img.htm @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/css3_grad-radial.htm b/examples/webkit/webkit-guide/css3_grad-radial.htm index 7059828..308d8b5 100644 --- a/examples/webkit/webkit-guide/css3_grad-radial.htm +++ b/examples/webkit/webkit-guide/css3_grad-radial.htm @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/css3_gradientBack.htm b/examples/webkit/webkit-guide/css3_gradientBack.htm index c8b46f3..46097d9 100644 --- a/examples/webkit/webkit-guide/css3_gradientBack.htm +++ b/examples/webkit/webkit-guide/css3_gradientBack.htm @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/css3_gradientBackStop.htm b/examples/webkit/webkit-guide/css3_gradientBackStop.htm index f625489..05ec269 100644 --- a/examples/webkit/webkit-guide/css3_gradientBackStop.htm +++ b/examples/webkit/webkit-guide/css3_gradientBackStop.htm @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/css3_gradientButton.htm b/examples/webkit/webkit-guide/css3_gradientButton.htm index 031b020..3df7268 100644 --- a/examples/webkit/webkit-guide/css3_gradientButton.htm +++ b/examples/webkit/webkit-guide/css3_gradientButton.htm @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/css3_mask-grad.htm b/examples/webkit/webkit-guide/css3_mask-grad.htm index 7a85237..fd13acb 100644 --- a/examples/webkit/webkit-guide/css3_mask-grad.htm +++ b/examples/webkit/webkit-guide/css3_mask-grad.htm @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/css3_mask-img.htm b/examples/webkit/webkit-guide/css3_mask-img.htm index dd11220..93e3a75 100644 --- a/examples/webkit/webkit-guide/css3_mask-img.htm +++ b/examples/webkit/webkit-guide/css3_mask-img.htm @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/css3_multicol.htm b/examples/webkit/webkit-guide/css3_multicol.htm index 04e4672..7169f6c 100644 --- a/examples/webkit/webkit-guide/css3_multicol.htm +++ b/examples/webkit/webkit-guide/css3_multicol.htm @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/css3_reflect.htm b/examples/webkit/webkit-guide/css3_reflect.htm index 950f741..56a6241 100644 --- a/examples/webkit/webkit-guide/css3_reflect.htm +++ b/examples/webkit/webkit-guide/css3_reflect.htm @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/css3_scroll.htm b/examples/webkit/webkit-guide/css3_scroll.htm index 472b1bb..be6a843 100644 --- a/examples/webkit/webkit-guide/css3_scroll.htm +++ b/examples/webkit/webkit-guide/css3_scroll.htm @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/css3_sel-nth.htm b/examples/webkit/webkit-guide/css3_sel-nth.htm index 1673173..ded1737 100644 --- a/examples/webkit/webkit-guide/css3_sel-nth.htm +++ b/examples/webkit/webkit-guide/css3_sel-nth.htm @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/css3_shadow.htm b/examples/webkit/webkit-guide/css3_shadow.htm index 1321cbf..5955e1c 100644 --- a/examples/webkit/webkit-guide/css3_shadow.htm +++ b/examples/webkit/webkit-guide/css3_shadow.htm @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/css3_text-overflow.htm b/examples/webkit/webkit-guide/css3_text-overflow.htm index 52984c8..5f8cebd 100644 --- a/examples/webkit/webkit-guide/css3_text-overflow.htm +++ b/examples/webkit/webkit-guide/css3_text-overflow.htm @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/css3_text-shadow.htm b/examples/webkit/webkit-guide/css3_text-shadow.htm index 714e884..dcc7dc5 100644 --- a/examples/webkit/webkit-guide/css3_text-shadow.htm +++ b/examples/webkit/webkit-guide/css3_text-shadow.htm @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/css3_text-stroke.htm b/examples/webkit/webkit-guide/css3_text-stroke.htm index 851bfef..76668e6 100644 --- a/examples/webkit/webkit-guide/css3_text-stroke.htm +++ b/examples/webkit/webkit-guide/css3_text-stroke.htm @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/form_tapper.htm b/examples/webkit/webkit-guide/form_tapper.htm index e90ffad..991b99d 100644 --- a/examples/webkit/webkit-guide/form_tapper.htm +++ b/examples/webkit/webkit-guide/form_tapper.htm @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/form_toggler.htm b/examples/webkit/webkit-guide/form_toggler.htm index 597b75a..4ec99ed 100644 --- a/examples/webkit/webkit-guide/form_toggler.htm +++ b/examples/webkit/webkit-guide/form_toggler.htm @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/layout_link-fmt.htm b/examples/webkit/webkit-guide/layout_link-fmt.htm index 2bef2c4..3c2a95a 100644 --- a/examples/webkit/webkit-guide/layout_link-fmt.htm +++ b/examples/webkit/webkit-guide/layout_link-fmt.htm @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/layout_tbl-keyhole.htm b/examples/webkit/webkit-guide/layout_tbl-keyhole.htm index 56e6f87..7c23e68 100644 --- a/examples/webkit/webkit-guide/layout_tbl-keyhole.htm +++ b/examples/webkit/webkit-guide/layout_tbl-keyhole.htm @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/mob_condjs.htm b/examples/webkit/webkit-guide/mob_condjs.htm index 657f6d6..e857785 100644 --- a/examples/webkit/webkit-guide/mob_condjs.htm +++ b/examples/webkit/webkit-guide/mob_condjs.htm @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/mob_layout.htm b/examples/webkit/webkit-guide/mob_layout.htm index dea52e2..2e73a14 100644 --- a/examples/webkit/webkit-guide/mob_layout.htm +++ b/examples/webkit/webkit-guide/mob_layout.htm @@ -2,8 +2,7 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). All -rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/mob_mediaquery.htm b/examples/webkit/webkit-guide/mob_mediaquery.htm index c7b9794..296ca1b 100644 --- a/examples/webkit/webkit-guide/mob_mediaquery.htm +++ b/examples/webkit/webkit-guide/mob_mediaquery.htm @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + You may use this file under the terms of the BSD license as follows: diff --git a/examples/webkit/webkit-guide/storage.htm b/examples/webkit/webkit-guide/storage.htm index 33eb4df..bcd1d11 100644 --- a/examples/webkit/webkit-guide/storage.htm +++ b/examples/webkit/webkit-guide/storage.htm @@ -2,8 +2,8 @@ This file is part of QtWebKit -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -All rights reserved. +Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). + You may use this file under the terms of the BSD license as follows: |