diff options
author | Topi Reinio <topi.reinio@digia.com> | 2014-02-12 12:11:36 +0100 |
---|---|---|
committer | Topi Reiniƶ <topi.reinio@digia.com> | 2014-02-12 13:33:54 +0200 |
commit | 779108c8dac9c101610cca8a82ecea4f11c1445d (patch) | |
tree | 50eb947f1103212d28193f36281819b242448711 /basicsuite/textinput/TextArea.qml | |
parent | cc919f8de14d23ca4785b831f9bee677616a5196 (diff) |
Fix license issues in demo sources
Change-Id: I6c87139bb729f2970ae22d7ef92688de647f8e3c
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>
Diffstat (limited to 'basicsuite/textinput/TextArea.qml')
-rw-r--r-- | basicsuite/textinput/TextArea.qml | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/basicsuite/textinput/TextArea.qml b/basicsuite/textinput/TextArea.qml index cf337f6..430a3ad 100644 --- a/basicsuite/textinput/TextArea.qml +++ b/basicsuite/textinput/TextArea.qml @@ -1,9 +1,10 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Contact: For any questions to Digia, please use the contact form at +** http://qt.digia.com/ ** -** This file is part of the examples of the Qt Toolkit. +** This file is part of the examples of the Qt Enterprise Embedded. ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: @@ -17,10 +18,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |