summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeemu Kaukoranta <teemu.kaukoranta@digia.com>2013-05-28 14:41:00 +0300
committerSergio Ahumada <sergio.ahumada@digia.com>2013-05-30 19:35:40 +0200
commit171c7228d39e5fcb7d034f3f6bbb82ad61a33eb8 (patch)
tree1af9ba61d07a15e05d82d1b17a3a667706013fc5
parent3e80b5966720862e37ef10a25dd911eb3e8f75c5 (diff)
Changed contact details
Contact details from 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}') Change-Id: I9c3e3b701dd1e14b76bef8b216e9c9e3294843cd Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
-rw-r--r--examples/animatedbackground/BackgroundSwirls.qml2
-rw-r--r--examples/animatedbackground/SlideDeck.qml2
-rw-r--r--examples/animatedbackground/SlideDeckRotated.qml2
-rw-r--r--examples/animatedbackground/Swirl.qml2
-rw-r--r--examples/customtransition/OpacityTransitionPresentation.qml2
-rw-r--r--examples/customtransition/SlideDeck.qml2
-rw-r--r--examples/customtransition/SlideDeckRotated.qml2
-rw-r--r--examples/notes/SlideDeck.qml2
-rw-r--r--examples/tutorial/CodeSection.qml2
-rw-r--r--examples/tutorial/SlideDeck.qml2
-rw-r--r--examples/tutorial/SlideDeckRotated.qml2
-rw-r--r--src/Clock.qml2
-rw-r--r--src/CodeSlide.qml2
-rw-r--r--src/Presentation.qml2
-rw-r--r--src/Slide.qml2
-rw-r--r--src/SlideCounter.qml2
-rw-r--r--tools/printslides/main.cpp2
-rw-r--r--tools/printslides/slideview.cpp2
-rw-r--r--tools/printslides/slideview.h2
19 files changed, 19 insertions, 19 deletions
diff --git a/examples/animatedbackground/BackgroundSwirls.qml b/examples/animatedbackground/BackgroundSwirls.qml
index 14f1a58..7d83278 100644
--- a/examples/animatedbackground/BackgroundSwirls.qml
+++ b/examples/animatedbackground/BackgroundSwirls.qml
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2012 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 QML Presentation System.
**
diff --git a/examples/animatedbackground/SlideDeck.qml b/examples/animatedbackground/SlideDeck.qml
index e85dda9..88b690b 100644
--- a/examples/animatedbackground/SlideDeck.qml
+++ b/examples/animatedbackground/SlideDeck.qml
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2012 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 QML Presentation System.
**
diff --git a/examples/animatedbackground/SlideDeckRotated.qml b/examples/animatedbackground/SlideDeckRotated.qml
index cc36a0d..ee9766e 100644
--- a/examples/animatedbackground/SlideDeckRotated.qml
+++ b/examples/animatedbackground/SlideDeckRotated.qml
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2012 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 QML Presentation System.
**
diff --git a/examples/animatedbackground/Swirl.qml b/examples/animatedbackground/Swirl.qml
index 9dc292f..72a64a9 100644
--- a/examples/animatedbackground/Swirl.qml
+++ b/examples/animatedbackground/Swirl.qml
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2012 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 QML Presentation System.
**
diff --git a/examples/customtransition/OpacityTransitionPresentation.qml b/examples/customtransition/OpacityTransitionPresentation.qml
index d257c6c..1075587 100644
--- a/examples/customtransition/OpacityTransitionPresentation.qml
+++ b/examples/customtransition/OpacityTransitionPresentation.qml
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2012 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 QML Presentation System.
**
diff --git a/examples/customtransition/SlideDeck.qml b/examples/customtransition/SlideDeck.qml
index c1bef83..59f29c4 100644
--- a/examples/customtransition/SlideDeck.qml
+++ b/examples/customtransition/SlideDeck.qml
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2012 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 QML Presentation System.
**
diff --git a/examples/customtransition/SlideDeckRotated.qml b/examples/customtransition/SlideDeckRotated.qml
index cc36a0d..ee9766e 100644
--- a/examples/customtransition/SlideDeckRotated.qml
+++ b/examples/customtransition/SlideDeckRotated.qml
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2012 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 QML Presentation System.
**
diff --git a/examples/notes/SlideDeck.qml b/examples/notes/SlideDeck.qml
index b45b0ab..bb4d0a4 100644
--- a/examples/notes/SlideDeck.qml
+++ b/examples/notes/SlideDeck.qml
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2012 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 QML Presentation System.
**
diff --git a/examples/tutorial/CodeSection.qml b/examples/tutorial/CodeSection.qml
index a62ba98..dac65fa 100644
--- a/examples/tutorial/CodeSection.qml
+++ b/examples/tutorial/CodeSection.qml
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2012 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 QML Presentation System.
**
diff --git a/examples/tutorial/SlideDeck.qml b/examples/tutorial/SlideDeck.qml
index c7213ce..45afc32 100644
--- a/examples/tutorial/SlideDeck.qml
+++ b/examples/tutorial/SlideDeck.qml
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2012 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 QML Presentation System.
**
diff --git a/examples/tutorial/SlideDeckRotated.qml b/examples/tutorial/SlideDeckRotated.qml
index cc36a0d..ee9766e 100644
--- a/examples/tutorial/SlideDeckRotated.qml
+++ b/examples/tutorial/SlideDeckRotated.qml
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2012 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 QML Presentation System.
**
diff --git a/src/Clock.qml b/src/Clock.qml
index fb7bc6b..77fea9f 100644
--- a/src/Clock.qml
+++ b/src/Clock.qml
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2012 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 QML Presentation System.
**
diff --git a/src/CodeSlide.qml b/src/CodeSlide.qml
index b70ecb7..789a26a 100644
--- a/src/CodeSlide.qml
+++ b/src/CodeSlide.qml
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2012 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 QML Presentation System.
**
diff --git a/src/Presentation.qml b/src/Presentation.qml
index 5b20c69..e988354 100644
--- a/src/Presentation.qml
+++ b/src/Presentation.qml
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2012 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 QML Presentation System.
**
diff --git a/src/Slide.qml b/src/Slide.qml
index 89b1793..eff235c 100644
--- a/src/Slide.qml
+++ b/src/Slide.qml
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2012 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 QML Presentation System.
**
diff --git a/src/SlideCounter.qml b/src/SlideCounter.qml
index 6f48851..498cd1c 100644
--- a/src/SlideCounter.qml
+++ b/src/SlideCounter.qml
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2012 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 QML Presentation System.
**
diff --git a/tools/printslides/main.cpp b/tools/printslides/main.cpp
index cb3af5a..9256b03 100644
--- a/tools/printslides/main.cpp
+++ b/tools/printslides/main.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2012 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 QML Presentation System.
**
diff --git a/tools/printslides/slideview.cpp b/tools/printslides/slideview.cpp
index 4513d37..66ba760 100644
--- a/tools/printslides/slideview.cpp
+++ b/tools/printslides/slideview.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2012 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 QML Presentation System.
**
diff --git a/tools/printslides/slideview.h b/tools/printslides/slideview.h
index 6f8319e..1dbe33d 100644
--- a/tools/printslides/slideview.h
+++ b/tools/printslides/slideview.h
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2012 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 QML Presentation System.
**