summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeemu Kaukoranta <teemu.kaukoranta@digia.com>2013-05-27 12:10:02 +0300
committerSergio Ahumada <sergio.ahumada@digia.com>2013-05-27 20:38:21 +0200
commite657c8472cd2430ac783f232a9189f9fc57a58d7 (patch)
tree56268b00aec82821aa77641cbb5896e443e8d1a8
parente2e9f410cfb211b0660a51283b948d76c0dd03a4 (diff)
Changed Contact details "qt-project.org/" to "qt-project.org/legal"
Used the following command: find . -path '*/3rdparty/*' -prune -o -exec grep -ilI -E '.*Copyright.*Nokia.*|.*Contact.*' {} \; | tee >(xargs sed -i -r '1,50 { /INdT|copy[a-z]*[ ]*=/ !{ 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.*|.*http:\/\/www\.qt-project\.org\/.*)/ \1Contact: http:\/\/www\.qt-project\.org\/legal/I') >(xargs sed -i -r '1,50{/(^[ \t:#*]*)(all rights reserved.*)/Id}') Command now finds command details that point to qt-project.org and changes them to qt-project.org/legal Also no longer wrongly replaces code snippet "copyright = ..". Need to fix these case-by-case later. Change-Id: I540431f916247192d748479fc6c816ebf773516c Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
-rw-r--r--doc/src/examples/logging.qdoc2
-rw-r--r--examples/logger/main.cpp2
-rw-r--r--src/logger/qlogger.cpp2
-rw-r--r--src/logger/qlogger.h2
-rw-r--r--src/logger/qlogger_p.h2
-rw-r--r--src/logger/qloggerglobal.h2
-rw-r--r--tests/auto/logger/tst_qlogger.cpp2
-rw-r--r--tests/auto/loggerenvar/tst_qloggerenvar.cpp2
8 files changed, 8 insertions, 8 deletions
diff --git a/doc/src/examples/logging.qdoc b/doc/src/examples/logging.qdoc
index 46a71aa..bc7c18d 100644
--- a/doc/src/examples/logging.qdoc
+++ b/doc/src/examples/logging.qdoc
@@ -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 documentation of the Qt Toolkit.
**
diff --git a/examples/logger/main.cpp b/examples/logger/main.cpp
index ea5e489..8e6ed3b 100644
--- a/examples/logger/main.cpp
+++ b/examples/logger/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 demonstration applications of the logger module
** of the Qt Toolkit.
diff --git a/src/logger/qlogger.cpp b/src/logger/qlogger.cpp
index b65a9ed..b30966d 100644
--- a/src/logger/qlogger.cpp
+++ b/src/logger/qlogger.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 logger module of the Qt Toolkit.
**
diff --git a/src/logger/qlogger.h b/src/logger/qlogger.h
index 967308e..07835c4 100644
--- a/src/logger/qlogger.h
+++ b/src/logger/qlogger.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 logger module of the Qt Toolkit.
**
diff --git a/src/logger/qlogger_p.h b/src/logger/qlogger_p.h
index fab6d6d..c51b238 100644
--- a/src/logger/qlogger_p.h
+++ b/src/logger/qlogger_p.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 QtLogger module of the Qt Toolkit.
**
diff --git a/src/logger/qloggerglobal.h b/src/logger/qloggerglobal.h
index cc9593f..1930f9b 100644
--- a/src/logger/qloggerglobal.h
+++ b/src/logger/qloggerglobal.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 logger module of the Qt Toolkit.
**
diff --git a/tests/auto/logger/tst_qlogger.cpp b/tests/auto/logger/tst_qlogger.cpp
index 5996d12..65060dd 100644
--- a/tests/auto/logger/tst_qlogger.cpp
+++ b/tests/auto/logger/tst_qlogger.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 test suite of the Qt Toolkit.
**
diff --git a/tests/auto/loggerenvar/tst_qloggerenvar.cpp b/tests/auto/loggerenvar/tst_qloggerenvar.cpp
index 5a7c478..4241c17 100644
--- a/tests/auto/loggerenvar/tst_qloggerenvar.cpp
+++ b/tests/auto/loggerenvar/tst_qloggerenvar.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 test suite of the Qt Toolkit.
**