diff options
author | Teemu Kaukoranta <teemu.kaukoranta@digia.com> | 2013-06-17 09:39:23 +0300 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-06-19 10:14:28 +0200 |
commit | b5c15fd4b9a3dfbb9d8f35c7156bdf8ac87572ed (patch) | |
tree | a4d84a0ba0c6cfc01fa5ad7a7e998cabdebd353b | |
parent | 1837bafc23d252fc7a7e9b86618d6e688063b17f (diff) |
Updated licenses and contact details
Contacts and licenses updated using replace_copyrights_contacts.sh and
licence_tag_adder.sh from mkdist repo.
Change-Id: Icc9aabf4701363da94fe4b04eaeca1b657f422f1
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
63 files changed, 84 insertions, 84 deletions
diff --git a/animators/src/qsgabstractanimation.cpp b/animators/src/qsgabstractanimation.cpp index 8552413..420a78e 100644 --- a/animators/src/qsgabstractanimation.cpp +++ b/animators/src/qsgabstractanimation.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 Scenegraph Playground module of the Qt Toolkit. ** diff --git a/animators/src/qsgabstractanimation.h b/animators/src/qsgabstractanimation.h index c25603c..41d800b 100644 --- a/animators/src/qsgabstractanimation.h +++ b/animators/src/qsgabstractanimation.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 plugins of %MODULE%. ** diff --git a/animators/src/qsgabstractanimator.cpp b/animators/src/qsgabstractanimator.cpp index 7c66ede..5fbf026 100644 --- a/animators/src/qsgabstractanimator.cpp +++ b/animators/src/qsgabstractanimator.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 plugins of %MODULE%. ** diff --git a/animators/src/qsgabstractanimator.h b/animators/src/qsgabstractanimator.h index 1a512e7..aa8813a 100644 --- a/animators/src/qsgabstractanimator.h +++ b/animators/src/qsgabstractanimator.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 plugins of %MODULE%. ** diff --git a/animators/src/qsganimatedproperty.cpp b/animators/src/qsganimatedproperty.cpp index d2c1f8a..301a123 100644 --- a/animators/src/qsganimatedproperty.cpp +++ b/animators/src/qsganimatedproperty.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 plugins of %MODULE%. ** diff --git a/animators/src/qsganimatedproperty.h b/animators/src/qsganimatedproperty.h index a5bc7b3..42f19ff 100644 --- a/animators/src/qsganimatedproperty.h +++ b/animators/src/qsganimatedproperty.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 plugins of %MODULE%. ** diff --git a/animators/src/qsganimatedrotation.cpp b/animators/src/qsganimatedrotation.cpp index 9274d77..bb72153 100644 --- a/animators/src/qsganimatedrotation.cpp +++ b/animators/src/qsganimatedrotation.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 plugins of %MODULE%. ** diff --git a/animators/src/qsganimatedrotation.h b/animators/src/qsganimatedrotation.h index 9098f97..ff5c606 100644 --- a/animators/src/qsganimatedrotation.h +++ b/animators/src/qsganimatedrotation.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 plugins of %MODULE%. ** diff --git a/animators/src/qsganimatedscale.cpp b/animators/src/qsganimatedscale.cpp index 4482710..549b0ec 100644 --- a/animators/src/qsganimatedscale.cpp +++ b/animators/src/qsganimatedscale.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 plugins of %MODULE%. ** diff --git a/animators/src/qsganimatedscale.h b/animators/src/qsganimatedscale.h index 650da06..9786a9e 100644 --- a/animators/src/qsganimatedscale.h +++ b/animators/src/qsganimatedscale.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 plugins of %MODULE%. ** diff --git a/animators/src/qsganimatedtransform.cpp b/animators/src/qsganimatedtransform.cpp index 45d341d..f7eee31 100644 --- a/animators/src/qsganimatedtransform.cpp +++ b/animators/src/qsganimatedtransform.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 plugins of %MODULE%. ** diff --git a/animators/src/qsganimatedtransform.h b/animators/src/qsganimatedtransform.h index 7964fba..4b50a5f 100644 --- a/animators/src/qsganimatedtransform.h +++ b/animators/src/qsganimatedtransform.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 plugins of %MODULE%. ** diff --git a/animators/src/qsganimatedtranslate.cpp b/animators/src/qsganimatedtranslate.cpp index df32528..24d9eac 100644 --- a/animators/src/qsganimatedtranslate.cpp +++ b/animators/src/qsganimatedtranslate.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 plugins of %MODULE%. ** diff --git a/animators/src/qsganimatedtranslate.h b/animators/src/qsganimatedtranslate.h index 07d63b1..0c850e4 100644 --- a/animators/src/qsganimatedtranslate.h +++ b/animators/src/qsganimatedtranslate.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 plugins of %MODULE%. ** diff --git a/animators/src/qsganimatorcontroller.cpp b/animators/src/qsganimatorcontroller.cpp index d261359..9588718 100644 --- a/animators/src/qsganimatorcontroller.cpp +++ b/animators/src/qsganimatorcontroller.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 Scenegraph Playground module of the Qt Toolkit. ** diff --git a/animators/src/qsganimatorcontroller.h b/animators/src/qsganimatorcontroller.h index 4436cc7..90be604 100644 --- a/animators/src/qsganimatorcontroller.h +++ b/animators/src/qsganimatorcontroller.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 plugins of %MODULE%. ** diff --git a/animators/src/qsganimatorhost.h b/animators/src/qsganimatorhost.h index 72aaefa..e3991e8 100644 --- a/animators/src/qsganimatorhost.h +++ b/animators/src/qsganimatorhost.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 plugins of %MODULE%. ** diff --git a/animators/src/qsganimatoritem.cpp b/animators/src/qsganimatoritem.cpp index c20d2d1..0f239ef 100644 --- a/animators/src/qsganimatoritem.cpp +++ b/animators/src/qsganimatoritem.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 Scenegraph Playground module of the Qt Toolkit. ** diff --git a/animators/src/qsganimatoritem.h b/animators/src/qsganimatoritem.h index 958b84d..6423b5e 100644 --- a/animators/src/qsganimatoritem.h +++ b/animators/src/qsganimatoritem.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 plugins of %MODULE%. ** diff --git a/animators/src/qsganimatornode.cpp b/animators/src/qsganimatornode.cpp index 571fde8..fd522af 100644 --- a/animators/src/qsganimatornode.cpp +++ b/animators/src/qsganimatornode.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 plugins of %MODULE%. ** diff --git a/animators/src/qsganimatornode.h b/animators/src/qsganimatornode.h index 881e696..28a5cb3 100644 --- a/animators/src/qsganimatornode.h +++ b/animators/src/qsganimatornode.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 plugins of %MODULE%. ** diff --git a/animators/src/qsganimatorplugin.cpp b/animators/src/qsganimatorplugin.cpp index 56d22aa..947339c 100644 --- a/animators/src/qsganimatorplugin.cpp +++ b/animators/src/qsganimatorplugin.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 plugins of %MODULE%. ** diff --git a/animators/src/qsganimatorshadereffect.cpp b/animators/src/qsganimatorshadereffect.cpp index 5909ca5..b392bc5 100644 --- a/animators/src/qsganimatorshadereffect.cpp +++ b/animators/src/qsganimatorshadereffect.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 plugins of %MODULE%. ** diff --git a/animators/src/qsganimatorshadereffect.h b/animators/src/qsganimatorshadereffect.h index 684a6a8..eea13e8 100644 --- a/animators/src/qsganimatorshadereffect.h +++ b/animators/src/qsganimatorshadereffect.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 plugins of %MODULE%. ** diff --git a/animators/src/qsgcoloranimation.cpp b/animators/src/qsgcoloranimation.cpp index 6918357..0eb09a4 100644 --- a/animators/src/qsgcoloranimation.cpp +++ b/animators/src/qsgcoloranimation.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 plugins of %MODULE%. ** diff --git a/animators/src/qsgcoloranimation.h b/animators/src/qsgcoloranimation.h index f376654..39f2243 100644 --- a/animators/src/qsgcoloranimation.h +++ b/animators/src/qsgcoloranimation.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 plugins of %MODULE%. ** diff --git a/animators/src/qsgnumberanimation.cpp b/animators/src/qsgnumberanimation.cpp index a355408..4848221 100644 --- a/animators/src/qsgnumberanimation.cpp +++ b/animators/src/qsgnumberanimation.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 plugins of %MODULE%. ** diff --git a/animators/src/qsgnumberanimation.h b/animators/src/qsgnumberanimation.h index 280288a..9f46b7b 100644 --- a/animators/src/qsgnumberanimation.h +++ b/animators/src/qsgnumberanimation.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 Scenegraph Playground module of the Qt Toolkit. ** diff --git a/animators/src/qsgparallelanimation.cpp b/animators/src/qsgparallelanimation.cpp index 10bb13c..8546d2c 100644 --- a/animators/src/qsgparallelanimation.cpp +++ b/animators/src/qsgparallelanimation.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 plugins of %MODULE%. ** diff --git a/animators/src/qsgparallelanimation.h b/animators/src/qsgparallelanimation.h index 6a91c78..a2a82c3 100644 --- a/animators/src/qsgparallelanimation.h +++ b/animators/src/qsgparallelanimation.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 Scenegraph Playground module of the Qt Toolkit. ** diff --git a/animators/src/qsgparallelanimator.cpp b/animators/src/qsgparallelanimator.cpp index 25f907c..9755f4f 100644 --- a/animators/src/qsgparallelanimator.cpp +++ b/animators/src/qsgparallelanimator.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 plugins of %MODULE%. ** diff --git a/animators/src/qsgparallelanimator.h b/animators/src/qsgparallelanimator.h index a03a8e2..f0ee29c 100644 --- a/animators/src/qsgparallelanimator.h +++ b/animators/src/qsgparallelanimator.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 Scenegraph Playground module of the Qt Toolkit. ** diff --git a/animators/src/qsgpauseanimation.cpp b/animators/src/qsgpauseanimation.cpp index a775f6e..47335d3 100644 --- a/animators/src/qsgpauseanimation.cpp +++ b/animators/src/qsgpauseanimation.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 plugins of %MODULE%. ** diff --git a/animators/src/qsgpauseanimation.h b/animators/src/qsgpauseanimation.h index a46fc44..9ccf6ed 100644 --- a/animators/src/qsgpauseanimation.h +++ b/animators/src/qsgpauseanimation.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 Scenegraph Playground module of the Qt Toolkit. ** diff --git a/animators/src/qsgpauseanimator.cpp b/animators/src/qsgpauseanimator.cpp index c66d55c..8a79758 100644 --- a/animators/src/qsgpauseanimator.cpp +++ b/animators/src/qsgpauseanimator.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 plugins of %MODULE%. ** diff --git a/animators/src/qsgpauseanimator.h b/animators/src/qsgpauseanimator.h index 8a28e0a..bae07ff 100644 --- a/animators/src/qsgpauseanimator.h +++ b/animators/src/qsgpauseanimator.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 plugins of %MODULE%. ** diff --git a/animators/src/qsgpropertyanimation.cpp b/animators/src/qsgpropertyanimation.cpp index 9348449..acad77a 100644 --- a/animators/src/qsgpropertyanimation.cpp +++ b/animators/src/qsgpropertyanimation.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 plugins of %MODULE%. ** diff --git a/animators/src/qsgpropertyanimation.h b/animators/src/qsgpropertyanimation.h index 5408f30..1acbbbc 100644 --- a/animators/src/qsgpropertyanimation.h +++ b/animators/src/qsgpropertyanimation.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 Scenegraph Playground module of the Qt Toolkit. ** diff --git a/animators/src/qsgpropertyanimator.cpp b/animators/src/qsgpropertyanimator.cpp index 4a7334e..b4b4c3c 100644 --- a/animators/src/qsgpropertyanimator.cpp +++ b/animators/src/qsgpropertyanimator.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 plugins of %MODULE%. ** diff --git a/animators/src/qsgpropertyanimator.h b/animators/src/qsgpropertyanimator.h index e3e10fe..6aaf9b2 100644 --- a/animators/src/qsgpropertyanimator.h +++ b/animators/src/qsgpropertyanimator.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 plugins of %MODULE%. ** diff --git a/animators/src/qsgsequentialanimation.cpp b/animators/src/qsgsequentialanimation.cpp index 42a2ad8..4bcef1b 100644 --- a/animators/src/qsgsequentialanimation.cpp +++ b/animators/src/qsgsequentialanimation.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 Scenegraph Playground module of the Qt Toolkit. ** diff --git a/animators/src/qsgsequentialanimation.h b/animators/src/qsgsequentialanimation.h index 2b51283..1679588 100644 --- a/animators/src/qsgsequentialanimation.h +++ b/animators/src/qsgsequentialanimation.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 plugins of %MODULE%. ** diff --git a/animators/src/qsgsequentialanimator.cpp b/animators/src/qsgsequentialanimator.cpp index 9303350..54adf34 100644 --- a/animators/src/qsgsequentialanimator.cpp +++ b/animators/src/qsgsequentialanimator.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 Scenegraph Playground module of the Qt Toolkit. ** diff --git a/animators/src/qsgsequentialanimator.h b/animators/src/qsgsequentialanimator.h index 0ec7927..6552715 100644 --- a/animators/src/qsgsequentialanimator.h +++ b/animators/src/qsgsequentialanimator.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 Scenegraph Playground module of the Qt Toolkit. ** diff --git a/animators/src/qsgtoplevelanimator.cpp b/animators/src/qsgtoplevelanimator.cpp index 9f8d75f..da3996c 100644 --- a/animators/src/qsgtoplevelanimator.cpp +++ b/animators/src/qsgtoplevelanimator.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 Scenegraph Playground module of the Qt Toolkit. ** diff --git a/animators/src/qsgtoplevelanimator.h b/animators/src/qsgtoplevelanimator.h index d2098bc..de4230e 100644 --- a/animators/src/qsgtoplevelanimator.h +++ b/animators/src/qsgtoplevelanimator.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 plugins of %MODULE%. ** diff --git a/animators/src/qsgvector3danimation.cpp b/animators/src/qsgvector3danimation.cpp index a8c5876..a41112f 100644 --- a/animators/src/qsgvector3danimation.cpp +++ b/animators/src/qsgvector3danimation.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 Scenegraph Playground module of the Qt Toolkit. ** diff --git a/animators/src/qsgvector3danimation.h b/animators/src/qsgvector3danimation.h index fc9579e..d91f8b1 100644 --- a/animators/src/qsgvector3danimation.h +++ b/animators/src/qsgvector3danimation.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 Scenegraph Playground module of the Qt Toolkit. ** diff --git a/benchmarks/listbench/ContactList.qml b/benchmarks/listbench/ContactList.qml index 9ef1dc0..a8f7eb1 100644 --- a/benchmarks/listbench/ContactList.qml +++ b/benchmarks/listbench/ContactList.qml @@ -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 Scenegraph Playground module of the Qt Toolkit. ** diff --git a/benchmarks/listbench/main.qml b/benchmarks/listbench/main.qml index af5a95c..34aa0d0 100644 --- a/benchmarks/listbench/main.qml +++ b/benchmarks/listbench/main.qml @@ -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 Scenegraph Playground module of the Qt Toolkit. ** diff --git a/customcontext/animation/animationdriver.cpp b/customcontext/animation/animationdriver.cpp index 49ccd6c..4092b66 100644 --- a/customcontext/animation/animationdriver.cpp +++ b/customcontext/animation/animationdriver.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 Scenegraph Playground module of the Qt Toolkit. ** diff --git a/customcontext/animation/animationdriver.h b/customcontext/animation/animationdriver.h index 8c7edce..0c9d0fd 100644 --- a/customcontext/animation/animationdriver.h +++ b/customcontext/animation/animationdriver.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 Scenegraph Playground module of the Qt Toolkit. ** diff --git a/customcontext/context.cpp b/customcontext/context.cpp index a2497ae..c6ff7db 100644 --- a/customcontext/context.cpp +++ b/customcontext/context.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 Scenegraph Playground module of the Qt Toolkit. ** diff --git a/customcontext/context.h b/customcontext/context.h index 4dc4e1d..2addd26 100644 --- a/customcontext/context.h +++ b/customcontext/context.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 Scenegraph Playground module of the Qt Toolkit. ** diff --git a/customcontext/pluginmain.cpp b/customcontext/pluginmain.cpp index 14008e0..6c97182 100644 --- a/customcontext/pluginmain.cpp +++ b/customcontext/pluginmain.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 Scenegraph Playground module of the Qt Toolkit. ** diff --git a/customcontext/pluginmain.h b/customcontext/pluginmain.h index 7cc4629..8557785 100644 --- a/customcontext/pluginmain.h +++ b/customcontext/pluginmain.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 Scenegraph Playground module of the Qt Toolkit. ** diff --git a/customcontext/renderer/overlaprenderer.cpp b/customcontext/renderer/overlaprenderer.cpp index 7353e6f..41a6c88 100644 --- a/customcontext/renderer/overlaprenderer.cpp +++ b/customcontext/renderer/overlaprenderer.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 Scenegraph Playground module of the Qt Toolkit. ** diff --git a/customcontext/renderer/overlaprenderer.h b/customcontext/renderer/overlaprenderer.h index b7b83cd..6fbf73f 100644 --- a/customcontext/renderer/overlaprenderer.h +++ b/customcontext/renderer/overlaprenderer.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 Scenegraph Playground module of the Qt Toolkit. ** diff --git a/customcontext/texture/atlastexture.cpp b/customcontext/texture/atlastexture.cpp index 836ed72..f99c08c 100644 --- a/customcontext/texture/atlastexture.cpp +++ b/customcontext/texture/atlastexture.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 Scenegraph Playground module of the Qt Toolkit. ** diff --git a/customcontext/texture/atlastexture.h b/customcontext/texture/atlastexture.h index 535899d..47f54b7 100644 --- a/customcontext/texture/atlastexture.h +++ b/customcontext/texture/atlastexture.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 Scenegraph Playground module of the Qt Toolkit. ** diff --git a/shapes/tools/maskmaker/maskmaker.cpp b/shapes/tools/maskmaker/maskmaker.cpp index 3f092cb..014ae46 100644 --- a/shapes/tools/maskmaker/maskmaker.cpp +++ b/shapes/tools/maskmaker/maskmaker.cpp @@ -1,38 +1,38 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: http://www.qt-project.org/legal ** ** This file is part of the Scenegraph Playground module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** ** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Digia. -** -** -** -** +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. ** ** ** $QT_END_LICENSE$ diff --git a/utils/binprof_reader/reader.cpp b/utils/binprof_reader/reader.cpp index 3aebb4e..c878445 100644 --- a/utils/binprof_reader/reader.cpp +++ b/utils/binprof_reader/reader.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 Scenegraph Playground module of the Qt Toolkit. ** diff --git a/utils/setrenderoption/main.cpp b/utils/setrenderoption/main.cpp index ad4c30d..9a9b618 100644 --- a/utils/setrenderoption/main.cpp +++ b/utils/setrenderoption/main.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 Scenegraph Playground module of the Qt Toolkit. ** |