summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2012-11-26 12:51:48 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-27 19:31:21 +0100
commitf397901970354625124aaf6fbe04812f7337a3ca (patch)
tree9de43ad11f1f23ddb97472a5b37b3ad8309b77f5 /examples
parent027168168cb94ed4521816dc98ffcae4268d555a (diff)
Change copyright information from Nokia to Digia
Task-number: QTBUG-28156 Change-Id: Id6b1cd83155c61b0d3ead2d185b8968511d4a23f Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/webkit/webkit-guide/_index.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/webkit/webkit-guide/_index.html b/examples/webkit/webkit-guide/_index.html
index f3a1f9dfa6..cd6cd88fa3 100644
--- a/examples/webkit/webkit-guide/_index.html
+++ b/examples/webkit/webkit-guide/_index.html
@@ -280,15 +280,15 @@ entered (localStorage), but credit-card data s/b absent
</div>
<div class="footer">
<p>
- <acronym title="Copyright">&copy;</acronym> 2008-2010 Nokia Corporation and/or its
- subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation
+ <acronym title="Copyright">&copy;</acronym> 2012 Digia Plc and/or its
+ subsidiaries. Digia, Qt and their respective logos are trademarks of Digia Plc
in Finland and/or other countries worldwide.</p>
<p>
All other trademarks are property of their respective owners. <a title="Privacy Policy"
href="http://qt.nokia.com/about/privacy-policy">Privacy Policy</a></p>
<br />
<p>
- Licensees holding valid Qt Commercial licenses may use this document in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Nokia.</p>
+ Licensees holding valid Qt Commercial licenses may use this document in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Digia.</p>
<p>
Alternatively, this document may be used under the terms of the <a href="http://www.gnu.org/licenses/fdl.html">GNU
Free Documentation License version 1.3</a>