summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorTeemu Kaukoranta <teemu.kaukoranta@digia.com>2013-05-22 11:13:55 +0300
committerSergio Ahumada <sergio.ahumada@digia.com>2013-05-23 11:19:14 +0200
commit657f08da5abfdbc003f5c0d202a6a0c467969ba8 (patch)
tree6e7cabd5d0f555cc5452123d82fb09e7d9e3f798 /doc
parent4b9822e094020da9879614afce5052f5c35b01b0 (diff)
Replaced Nokia copyrights in headerHEADmaster
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/([ \t#*]*)(.*Copyright.*Nokia.*)/ \1Copyright \(C\) 2013 Digia Plc and\/or its subsidiary\(-ies\)\./I') >(xargs sed -i -r '1,10 s/(^[ \t#*]*)(all rights reserved.*)/\1/I') This excludes binary files and retains whitespace and #* characters in the beginning of the edited lines. Change-Id: I47899537bdb2fa92dd5b2aa981de08102219dd8d Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/src/QAlignedtimer/QAlignedtimer.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/QAlignedtimer/QAlignedtimer.qdoc b/doc/src/QAlignedtimer/QAlignedtimer.qdoc
index 76c5c87..9bd62fb 100644
--- a/doc/src/QAlignedtimer/QAlignedtimer.qdoc
+++ b/doc/src/QAlignedtimer/QAlignedtimer.qdoc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the documentation of the Qt Toolkit.