summaryrefslogtreecommitdiffstats
path: root/simpletest
diff options
context:
space:
mode:
authorTeemu Kaukoranta <teemu.kaukoranta@digia.com>2013-05-27 10:43:56 +0300
committerSergio Ahumada <sergio.ahumada@digia.com>2013-05-27 20:40:15 +0200
commitf030fdcd99e1e8eb5ef47d6e332beedb04787cf1 (patch)
treeb1e6f244726c61a6adf84bb183fc0f7563e66d90 /simpletest
parent93f609ee36a03ad4ff2162cf45e381f4eb78c78b (diff)
Replaced Nokia copyrights and contact detailsHEADmaster
Replaced Nokia copyrights with correct Digia copyrights. Text in front of copyright is now retained: ** File is part of Foo, Copyright Nokia... -> ** File is part of Foo, Copyright Digia... Replaced Nokia contact details with Digia's. Removing "All Rights Reserved" no longer leaves an empty line. Used the following command: find . -path '*/3rdparty/*' -prune -o -exec grep -ilI -E '.*Copyright.*Nokia.*|.*Contact.*Nokia.*' {} \; | tee >(xargs sed -i -r '1,50 { /INdT/ !{ s/(^[ \t:#*]*)([a-z ]*)(Copyright.*Nokia.*)/ \1\2Copyright \(C\) 2013 Digia Plc and\/or its subsidiary\(-ies\)\./I } }') >(xargs sed -i -r '1,50 s/(^[ \t:#*]*)(.*info@qt\.nokia\.com.* |.*INSERT EMAIL ADDRESS.*|.*qt-info@nokia\.com.* |.*qt-label1@nokia\.com.*|.*http:\/\/qt\.nokia\.com\/contact.* |.*qt-sales@nokia\.com.*) /\1Contact: http:\/\/www\.qt-project\.org\/legal/I') >(xargs sed -i -r '1,50{/(^[ \t:#*]*)(all rights reserved.*)/Id}') Change-Id: I7bb83e506f202c1d90034aa1ff60839a0a11e42f Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Diffstat (limited to 'simpletest')
-rw-r--r--simpletest/tst_simple_mimetypes.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/simpletest/tst_simple_mimetypes.cpp b/simpletest/tst_simple_mimetypes.cpp
index bd356c3..4795469 100644
--- a/simpletest/tst_simple_mimetypes.cpp
+++ b/simpletest/tst_simple_mimetypes.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtMimeTypes addon of the Qt Toolkit.
**