From db5631484b91156be5b1a348dc224e8b4a8f5380 Mon Sep 17 00:00:00 2001 From: Teemu Kaukoranta Date: Tue, 28 May 2013 13:57:44 +0300 Subject: [PATCH] Changed digia contact details to */legal, updated licenses Scripts are available in internal mkdist repo. Added license tags, updated licenses and copyrights/contacts Change-Id: Ibc734275f3000987eaa4f5c57f19d4e1fda2c479 Reviewed-by: Sergio Ahumada --- .../webkit/webkit-guide/_image_assets.htm | 73 +++++++++--------- examples/webkit/webkit-guide/anim_accord.htm | 73 +++++++++--------- .../webkit/webkit-guide/anim_demo-rotate.htm | 73 +++++++++--------- .../webkit/webkit-guide/anim_demo-scale.htm | 73 +++++++++--------- .../webkit/webkit-guide/anim_demo-skew.htm | 74 +++++++++---------- examples/webkit/webkit-guide/anim_gallery.htm | 73 +++++++++--------- examples/webkit/webkit-guide/anim_panel.htm | 73 +++++++++--------- examples/webkit/webkit-guide/anim_pulse.htm | 73 +++++++++--------- examples/webkit/webkit-guide/anim_skew.htm | 74 +++++++++---------- examples/webkit/webkit-guide/anim_slide1.htm | 73 +++++++++--------- examples/webkit/webkit-guide/anim_slide2.htm | 74 +++++++++---------- examples/webkit/webkit-guide/anim_slide3.htm | 74 +++++++++---------- .../webkit/webkit-guide/anim_tabbedSkew.htm | 73 +++++++++--------- .../webkit/webkit-guide/css3_backgrounds.htm | 74 +++++++++---------- .../webkit/webkit-guide/css3_border-img.htm | 74 +++++++++---------- .../webkit/webkit-guide/css3_grad-radial.htm | 73 +++++++++--------- .../webkit/webkit-guide/css3_gradientBack.htm | 74 +++++++++---------- .../webkit-guide/css3_gradientBackStop.htm | 73 +++++++++--------- .../webkit-guide/css3_gradientButton.htm | 73 +++++++++--------- .../webkit/webkit-guide/css3_mask-grad.htm | 73 +++++++++--------- .../webkit/webkit-guide/css3_mask-img.htm | 73 +++++++++--------- .../webkit/webkit-guide/css3_multicol.htm | 73 +++++++++--------- examples/webkit/webkit-guide/css3_reflect.htm | 73 +++++++++--------- examples/webkit/webkit-guide/css3_scroll.htm | 73 +++++++++--------- examples/webkit/webkit-guide/css3_sel-nth.htm | 73 +++++++++--------- examples/webkit/webkit-guide/css3_shadow.htm | 73 +++++++++--------- .../webkit-guide/css3_text-overflow.htm | 73 +++++++++--------- .../webkit/webkit-guide/css3_text-shadow.htm | 73 +++++++++--------- .../webkit/webkit-guide/css3_text-stroke.htm | 73 +++++++++--------- examples/webkit/webkit-guide/form_tapper.htm | 73 +++++++++--------- examples/webkit/webkit-guide/form_toggler.htm | 73 +++++++++--------- .../webkit/webkit-guide/layout_link-fmt.htm | 73 +++++++++--------- .../webkit-guide/layout_tbl-keyhole.htm | 73 +++++++++--------- examples/webkit/webkit-guide/mob_condjs.htm | 73 +++++++++--------- examples/webkit/webkit-guide/mob_layout.htm | 74 +++++++++---------- .../webkit/webkit-guide/mob_mediaquery.htm | 73 +++++++++--------- examples/webkit/webkit-guide/storage.htm | 73 +++++++++--------- qmake/generators/projectgenerator.cpp | 2 +- qmake/generators/projectgenerator.h | 2 +- .../statemachine/qsignaleventgenerator_p.h | 2 +- src/dbus/qdbusxmlgenerator.cpp | 2 +- src/tools/moc/generator.cpp | 2 +- src/tools/moc/generator.h | 2 +- src/tools/qdoc/ditaxmlgenerator.cpp | 2 +- src/tools/qdoc/ditaxmlgenerator.h | 2 +- src/tools/qdoc/generator.cpp | 2 +- src/tools/qdoc/generator.h | 2 +- src/tools/qdoc/htmlgenerator.cpp | 2 +- src/tools/qdoc/htmlgenerator.h | 2 +- 49 files changed, 1381 insertions(+), 1352 deletions(-) diff --git a/examples/webkit/webkit-guide/_image_assets.htm b/examples/webkit/webkit-guide/_image_assets.htm index f8ff8c6870d..c9b7a490392 100644 --- a/examples/webkit/webkit-guide/_image_assets.htm +++ b/examples/webkit/webkit-guide/_image_assets.htm @@ -1,40 +1,41 @@ diff --git a/examples/webkit/webkit-guide/anim_accord.htm b/examples/webkit/webkit-guide/anim_accord.htm index 139f9f2c1a7..1940632b03e 100644 --- a/examples/webkit/webkit-guide/anim_accord.htm +++ b/examples/webkit/webkit-guide/anim_accord.htm @@ -1,40 +1,41 @@ diff --git a/examples/webkit/webkit-guide/anim_demo-rotate.htm b/examples/webkit/webkit-guide/anim_demo-rotate.htm index 35fa65385af..41d89d626bc 100644 --- a/examples/webkit/webkit-guide/anim_demo-rotate.htm +++ b/examples/webkit/webkit-guide/anim_demo-rotate.htm @@ -1,40 +1,41 @@ diff --git a/examples/webkit/webkit-guide/anim_demo-scale.htm b/examples/webkit/webkit-guide/anim_demo-scale.htm index 4d3c173299c..59e50405ae7 100644 --- a/examples/webkit/webkit-guide/anim_demo-scale.htm +++ b/examples/webkit/webkit-guide/anim_demo-scale.htm @@ -1,40 +1,41 @@ diff --git a/examples/webkit/webkit-guide/anim_demo-skew.htm b/examples/webkit/webkit-guide/anim_demo-skew.htm index 0b7a6b6c048..81ee79062e2 100644 --- a/examples/webkit/webkit-guide/anim_demo-skew.htm +++ b/examples/webkit/webkit-guide/anim_demo-skew.htm @@ -1,42 +1,42 @@ - diff --git a/examples/webkit/webkit-guide/anim_gallery.htm b/examples/webkit/webkit-guide/anim_gallery.htm index 75a2ee09273..0edbfff3c77 100644 --- a/examples/webkit/webkit-guide/anim_gallery.htm +++ b/examples/webkit/webkit-guide/anim_gallery.htm @@ -1,40 +1,41 @@ diff --git a/examples/webkit/webkit-guide/anim_panel.htm b/examples/webkit/webkit-guide/anim_panel.htm index f79c95a2149..5cb442aab88 100644 --- a/examples/webkit/webkit-guide/anim_panel.htm +++ b/examples/webkit/webkit-guide/anim_panel.htm @@ -1,40 +1,41 @@ diff --git a/examples/webkit/webkit-guide/anim_pulse.htm b/examples/webkit/webkit-guide/anim_pulse.htm index 57e7cf59183..decd44183f7 100644 --- a/examples/webkit/webkit-guide/anim_pulse.htm +++ b/examples/webkit/webkit-guide/anim_pulse.htm @@ -1,40 +1,41 @@ diff --git a/examples/webkit/webkit-guide/anim_skew.htm b/examples/webkit/webkit-guide/anim_skew.htm index 458155b8278..abd1c2922fd 100644 --- a/examples/webkit/webkit-guide/anim_skew.htm +++ b/examples/webkit/webkit-guide/anim_skew.htm @@ -1,42 +1,42 @@ - diff --git a/examples/webkit/webkit-guide/anim_slide1.htm b/examples/webkit/webkit-guide/anim_slide1.htm index 0e5ba71706e..dd4a5511099 100644 --- a/examples/webkit/webkit-guide/anim_slide1.htm +++ b/examples/webkit/webkit-guide/anim_slide1.htm @@ -1,40 +1,41 @@ diff --git a/examples/webkit/webkit-guide/anim_slide2.htm b/examples/webkit/webkit-guide/anim_slide2.htm index 0fad61a9382..25ca25c785b 100644 --- a/examples/webkit/webkit-guide/anim_slide2.htm +++ b/examples/webkit/webkit-guide/anim_slide2.htm @@ -1,42 +1,42 @@ - diff --git a/examples/webkit/webkit-guide/anim_slide3.htm b/examples/webkit/webkit-guide/anim_slide3.htm index b7aecfd6b8b..1d612aa16de 100644 --- a/examples/webkit/webkit-guide/anim_slide3.htm +++ b/examples/webkit/webkit-guide/anim_slide3.htm @@ -1,42 +1,42 @@ - diff --git a/examples/webkit/webkit-guide/anim_tabbedSkew.htm b/examples/webkit/webkit-guide/anim_tabbedSkew.htm index 56565848cc9..1000103dd6c 100644 --- a/examples/webkit/webkit-guide/anim_tabbedSkew.htm +++ b/examples/webkit/webkit-guide/anim_tabbedSkew.htm @@ -1,40 +1,41 @@ diff --git a/examples/webkit/webkit-guide/css3_backgrounds.htm b/examples/webkit/webkit-guide/css3_backgrounds.htm index 4b7ea246915..89cb096bb70 100644 --- a/examples/webkit/webkit-guide/css3_backgrounds.htm +++ b/examples/webkit/webkit-guide/css3_backgrounds.htm @@ -1,42 +1,42 @@ - diff --git a/examples/webkit/webkit-guide/css3_border-img.htm b/examples/webkit/webkit-guide/css3_border-img.htm index 8b3d81753cb..ac255bed911 100644 --- a/examples/webkit/webkit-guide/css3_border-img.htm +++ b/examples/webkit/webkit-guide/css3_border-img.htm @@ -1,42 +1,42 @@ - diff --git a/examples/webkit/webkit-guide/css3_grad-radial.htm b/examples/webkit/webkit-guide/css3_grad-radial.htm index ba3be544e8a..bf35a2a5412 100644 --- a/examples/webkit/webkit-guide/css3_grad-radial.htm +++ b/examples/webkit/webkit-guide/css3_grad-radial.htm @@ -1,40 +1,41 @@ diff --git a/examples/webkit/webkit-guide/css3_gradientBack.htm b/examples/webkit/webkit-guide/css3_gradientBack.htm index 760a698eb97..7364590186f 100644 --- a/examples/webkit/webkit-guide/css3_gradientBack.htm +++ b/examples/webkit/webkit-guide/css3_gradientBack.htm @@ -1,42 +1,42 @@ - diff --git a/examples/webkit/webkit-guide/css3_gradientBackStop.htm b/examples/webkit/webkit-guide/css3_gradientBackStop.htm index e9456dbc8f3..4f6974a1583 100644 --- a/examples/webkit/webkit-guide/css3_gradientBackStop.htm +++ b/examples/webkit/webkit-guide/css3_gradientBackStop.htm @@ -1,40 +1,41 @@ diff --git a/examples/webkit/webkit-guide/css3_gradientButton.htm b/examples/webkit/webkit-guide/css3_gradientButton.htm index 86245f48846..f34ba37ad5f 100644 --- a/examples/webkit/webkit-guide/css3_gradientButton.htm +++ b/examples/webkit/webkit-guide/css3_gradientButton.htm @@ -1,40 +1,41 @@ diff --git a/examples/webkit/webkit-guide/css3_mask-grad.htm b/examples/webkit/webkit-guide/css3_mask-grad.htm index db6894b394f..d71fb4f1fdd 100644 --- a/examples/webkit/webkit-guide/css3_mask-grad.htm +++ b/examples/webkit/webkit-guide/css3_mask-grad.htm @@ -1,40 +1,41 @@ diff --git a/examples/webkit/webkit-guide/css3_mask-img.htm b/examples/webkit/webkit-guide/css3_mask-img.htm index df089dae314..b109021a886 100644 --- a/examples/webkit/webkit-guide/css3_mask-img.htm +++ b/examples/webkit/webkit-guide/css3_mask-img.htm @@ -1,40 +1,41 @@ diff --git a/examples/webkit/webkit-guide/css3_multicol.htm b/examples/webkit/webkit-guide/css3_multicol.htm index 51202615683..d721f202b89 100644 --- a/examples/webkit/webkit-guide/css3_multicol.htm +++ b/examples/webkit/webkit-guide/css3_multicol.htm @@ -1,40 +1,41 @@ diff --git a/examples/webkit/webkit-guide/css3_reflect.htm b/examples/webkit/webkit-guide/css3_reflect.htm index 106e5dd6d99..ffeba18e725 100644 --- a/examples/webkit/webkit-guide/css3_reflect.htm +++ b/examples/webkit/webkit-guide/css3_reflect.htm @@ -1,40 +1,41 @@ diff --git a/examples/webkit/webkit-guide/css3_scroll.htm b/examples/webkit/webkit-guide/css3_scroll.htm index cecc6350a93..7e1ee8e660a 100644 --- a/examples/webkit/webkit-guide/css3_scroll.htm +++ b/examples/webkit/webkit-guide/css3_scroll.htm @@ -1,40 +1,41 @@ diff --git a/examples/webkit/webkit-guide/css3_sel-nth.htm b/examples/webkit/webkit-guide/css3_sel-nth.htm index a65f1075e66..32c5425ac9d 100644 --- a/examples/webkit/webkit-guide/css3_sel-nth.htm +++ b/examples/webkit/webkit-guide/css3_sel-nth.htm @@ -1,40 +1,41 @@ diff --git a/examples/webkit/webkit-guide/css3_shadow.htm b/examples/webkit/webkit-guide/css3_shadow.htm index 0af8289ccda..995ea5a34c9 100644 --- a/examples/webkit/webkit-guide/css3_shadow.htm +++ b/examples/webkit/webkit-guide/css3_shadow.htm @@ -1,40 +1,41 @@ diff --git a/examples/webkit/webkit-guide/css3_text-overflow.htm b/examples/webkit/webkit-guide/css3_text-overflow.htm index 0d119710cc6..a062e99181c 100644 --- a/examples/webkit/webkit-guide/css3_text-overflow.htm +++ b/examples/webkit/webkit-guide/css3_text-overflow.htm @@ -1,40 +1,41 @@ diff --git a/examples/webkit/webkit-guide/css3_text-shadow.htm b/examples/webkit/webkit-guide/css3_text-shadow.htm index 35cae2ce31d..9527c708116 100644 --- a/examples/webkit/webkit-guide/css3_text-shadow.htm +++ b/examples/webkit/webkit-guide/css3_text-shadow.htm @@ -1,40 +1,41 @@ diff --git a/examples/webkit/webkit-guide/css3_text-stroke.htm b/examples/webkit/webkit-guide/css3_text-stroke.htm index 170f423b10a..73e06117bad 100644 --- a/examples/webkit/webkit-guide/css3_text-stroke.htm +++ b/examples/webkit/webkit-guide/css3_text-stroke.htm @@ -1,40 +1,41 @@ diff --git a/examples/webkit/webkit-guide/form_tapper.htm b/examples/webkit/webkit-guide/form_tapper.htm index 8490970857f..73b88c336d1 100644 --- a/examples/webkit/webkit-guide/form_tapper.htm +++ b/examples/webkit/webkit-guide/form_tapper.htm @@ -1,40 +1,41 @@ diff --git a/examples/webkit/webkit-guide/form_toggler.htm b/examples/webkit/webkit-guide/form_toggler.htm index 31218ed07e4..8674a267288 100644 --- a/examples/webkit/webkit-guide/form_toggler.htm +++ b/examples/webkit/webkit-guide/form_toggler.htm @@ -1,40 +1,41 @@ diff --git a/examples/webkit/webkit-guide/layout_link-fmt.htm b/examples/webkit/webkit-guide/layout_link-fmt.htm index dcb9e23dea9..1f927bf8f59 100644 --- a/examples/webkit/webkit-guide/layout_link-fmt.htm +++ b/examples/webkit/webkit-guide/layout_link-fmt.htm @@ -1,40 +1,41 @@ diff --git a/examples/webkit/webkit-guide/layout_tbl-keyhole.htm b/examples/webkit/webkit-guide/layout_tbl-keyhole.htm index d313da990e9..5daeb36ce71 100644 --- a/examples/webkit/webkit-guide/layout_tbl-keyhole.htm +++ b/examples/webkit/webkit-guide/layout_tbl-keyhole.htm @@ -1,40 +1,41 @@ diff --git a/examples/webkit/webkit-guide/mob_condjs.htm b/examples/webkit/webkit-guide/mob_condjs.htm index ddaac12e88a..89d3fa50d8d 100644 --- a/examples/webkit/webkit-guide/mob_condjs.htm +++ b/examples/webkit/webkit-guide/mob_condjs.htm @@ -1,40 +1,41 @@ diff --git a/examples/webkit/webkit-guide/mob_layout.htm b/examples/webkit/webkit-guide/mob_layout.htm index 72199f7a05a..768374983d6 100644 --- a/examples/webkit/webkit-guide/mob_layout.htm +++ b/examples/webkit/webkit-guide/mob_layout.htm @@ -1,41 +1,41 @@ diff --git a/examples/webkit/webkit-guide/mob_mediaquery.htm b/examples/webkit/webkit-guide/mob_mediaquery.htm index 9c8397a4fb8..79436399f1f 100644 --- a/examples/webkit/webkit-guide/mob_mediaquery.htm +++ b/examples/webkit/webkit-guide/mob_mediaquery.htm @@ -1,40 +1,41 @@ diff --git a/examples/webkit/webkit-guide/storage.htm b/examples/webkit/webkit-guide/storage.htm index 6168aec6d1a..9070eade581 100644 --- a/examples/webkit/webkit-guide/storage.htm +++ b/examples/webkit/webkit-guide/storage.htm @@ -1,40 +1,41 @@ diff --git a/qmake/generators/projectgenerator.cpp b/qmake/generators/projectgenerator.cpp index 54208de27ea..3cd5a22a33d 100644 --- a/qmake/generators/projectgenerator.cpp +++ b/qmake/generators/projectgenerator.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the qmake application of the Qt Toolkit. ** diff --git a/qmake/generators/projectgenerator.h b/qmake/generators/projectgenerator.h index 019ff9de445..621a9eb9770 100644 --- a/qmake/generators/projectgenerator.h +++ b/qmake/generators/projectgenerator.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the qmake application of the Qt Toolkit. ** diff --git a/src/corelib/statemachine/qsignaleventgenerator_p.h b/src/corelib/statemachine/qsignaleventgenerator_p.h index 4ed43c4edbf..160a24e7a3e 100644 --- a/src/corelib/statemachine/qsignaleventgenerator_p.h +++ b/src/corelib/statemachine/qsignaleventgenerator_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. ** diff --git a/src/dbus/qdbusxmlgenerator.cpp b/src/dbus/qdbusxmlgenerator.cpp index 387caae9572..8c822162e4a 100644 --- a/src/dbus/qdbusxmlgenerator.cpp +++ b/src/dbus/qdbusxmlgenerator.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDBus module of the Qt Toolkit. ** diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp index 44eb4f65e82..4757fdad931 100644 --- a/src/tools/moc/generator.cpp +++ b/src/tools/moc/generator.cpp @@ -2,7 +2,7 @@ ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Copyright (C) 2013 Olivier Goffart -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the tools applications of the Qt Toolkit. ** diff --git a/src/tools/moc/generator.h b/src/tools/moc/generator.h index aece7152b3e..203c856b7c7 100644 --- a/src/tools/moc/generator.h +++ b/src/tools/moc/generator.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the tools applications of the Qt Toolkit. ** diff --git a/src/tools/qdoc/ditaxmlgenerator.cpp b/src/tools/qdoc/ditaxmlgenerator.cpp index af8ac505f8d..96f5519be4d 100644 --- a/src/tools/qdoc/ditaxmlgenerator.cpp +++ b/src/tools/qdoc/ditaxmlgenerator.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the tools applications of the Qt Toolkit. ** diff --git a/src/tools/qdoc/ditaxmlgenerator.h b/src/tools/qdoc/ditaxmlgenerator.h index a55ccf81c85..a58504d7c7b 100644 --- a/src/tools/qdoc/ditaxmlgenerator.h +++ b/src/tools/qdoc/ditaxmlgenerator.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the tools applications of the Qt Toolkit. ** diff --git a/src/tools/qdoc/generator.cpp b/src/tools/qdoc/generator.cpp index 187253df50b..889f0f55ca3 100644 --- a/src/tools/qdoc/generator.cpp +++ b/src/tools/qdoc/generator.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the tools applications of the Qt Toolkit. ** diff --git a/src/tools/qdoc/generator.h b/src/tools/qdoc/generator.h index 2fb3117765a..58e90739224 100644 --- a/src/tools/qdoc/generator.h +++ b/src/tools/qdoc/generator.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the tools applications of the Qt Toolkit. ** diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp index 618547809e3..7cb56974d56 100644 --- a/src/tools/qdoc/htmlgenerator.cpp +++ b/src/tools/qdoc/htmlgenerator.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the tools applications of the Qt Toolkit. ** diff --git a/src/tools/qdoc/htmlgenerator.h b/src/tools/qdoc/htmlgenerator.h index cdf296e7832..0a6717461ed 100644 --- a/src/tools/qdoc/htmlgenerator.h +++ b/src/tools/qdoc/htmlgenerator.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the tools applications of the Qt Toolkit. **