diff --git a/LICENSE b/LICENSE index f65f5ddb33b7f42e600d7e9a3a4aa6c502cbb39b..84f572d2ce41177101fabc004d3ef5f25e108f5d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,8 +1,8 @@ Unless noted otherwise, the following 3-clause BSD-style license applies to the scripts in this package: -Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -Contact: http://www.qt-project.org/ +Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +Contact: http://www.qt-project.org/legal Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/bin/git-edit-commit b/bin/git-edit-commit index 120d8a99088d54a165bec58230d2ef0a3fc2b96a..804302f2f3cadd2cf92011d1535d2fc53e953996 100755 --- a/bin/git-edit-commit +++ b/bin/git-edit-commit @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -# Contact: http://www.qt-project.org/ +# Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +# Contact: http://www.qt-project.org/legal # # You may use this file under the terms of the 3-clause BSD license. # See the file LICENSE from this package for details. diff --git a/bin/git-gpush b/bin/git-gpush index 28560e139f7b500d52f7e6dbeb6d9aa0d0b8b733..50385300813a586a39324c89d67928df23eb3852 100755 --- a/bin/git-gpush +++ b/bin/git-gpush @@ -1,6 +1,6 @@ #!/usr/bin/env perl -# Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -# Contact: http://www.qt-project.org/ +# Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +# Contact: http://www.qt-project.org/legal # # You may use this file under the terms of the 3-clause BSD license. # See the file LICENSE from this package for details. @@ -80,8 +80,8 @@ Options: Reports all registered aliases. Copyright: - Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). - Contact: http://www.qt-project.org/ + Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + Contact: http://www.qt-project.org/legal License: You may use this file under the terms of the 3-clause BSD license. diff --git a/bin/git-note-review b/bin/git-note-review index 3d29093416853cbfedd63b3008f2e73855d9901f..ad0d4ec4f34c2dbdc794e1d4b92cde24316c3619 100755 --- a/bin/git-note-review +++ b/bin/git-note-review @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -# Contact: http://www.qt-project.org/ +# Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +# Contact: http://www.qt-project.org/legal # # You may use this file under the terms of the 3-clause BSD license. # See the file LICENSE from this package for details. diff --git a/bin/git-pasteapply b/bin/git-pasteapply index c0cc031c8a4317dbe3fa31e8f497208b66706a33..8b07645aea47552f26afc066d54f55ffbcd1bcb9 100755 --- a/bin/git-pasteapply +++ b/bin/git-pasteapply @@ -1,6 +1,6 @@ #!/usr/bin/env perl -# Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -# Contact: http://www.qt-project.org/ +# Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +# Contact: http://www.qt-project.org/legal # # You may use this file under the terms of the 3-clause BSD license. # See the file LICENSE from this package for details. diff --git a/bin/git-qt-cherry-pick b/bin/git-qt-cherry-pick index 410c2da9c0f14579a4ad6b740ed0267047a1b172..9310b7b75fc7790a78a4283acef3baf67f7342fc 100755 --- a/bin/git-qt-cherry-pick +++ b/bin/git-qt-cherry-pick @@ -1,6 +1,6 @@ #! /usr/bin/perl -# Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -# Contact: http://www.qt-project.org/ +# Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +# Contact: http://www.qt-project.org/legal # # You may use this file under the terms of the 3-clause BSD license. # See the file LICENSE from this package for details. diff --git a/bin/git-qt-grafts b/bin/git-qt-grafts index 4368a4ad1f60cae7e0eecfad9156097497298edc..6935951baa5acb3f8bb2e594de5c3770d829912f 100755 --- a/bin/git-qt-grafts +++ b/bin/git-qt-grafts @@ -5,8 +5,8 @@ # # Sets up the proper grafts for a Qt repository # -# Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -# Contact: http://www.qt-project.org/ +# Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +# Contact: http://www.qt-project.org/legal # #################################################################################################### diff --git a/bin/git-rewrite-author b/bin/git-rewrite-author index 566843ed32f3bd9b92ecb9a6f4fbc78c19eadfbc..378929e6ea9e6b1bc5518395c5524c69ffb39081 100755 --- a/bin/git-rewrite-author +++ b/bin/git-rewrite-author @@ -1,6 +1,6 @@ #!/usr/bin/env perl -# Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -# Contact: http://www.qt-project.org/ +# Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +# Contact: http://www.qt-project.org/legal # # You may use this file under the terms of the 3-clause BSD license. # See the file LICENSE from this package for details. diff --git a/bin/git-split-ws b/bin/git-split-ws index 3ee2b9d739c9946e0f4ba2d2ae8fb2e5b65e0d89..0128751ee627aa05421a38a7305625865bdb0684 100755 --- a/bin/git-split-ws +++ b/bin/git-split-ws @@ -1,6 +1,6 @@ #! /usr/bin/perl -# Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -# Contact: http://www.qt-project.org/ +# Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +# Contact: http://www.qt-project.org/legal # # You may use this file under the terms of the 3-clause BSD license. # See the file LICENSE from this package for details. diff --git a/bin/qt5_tool b/bin/qt5_tool index 7d6116f703b23ad69aeaa7dd6dc6c584fa164448..7c31b6ca52b15b64dba98fd514b710e01b0cfb73 100755 --- a/bin/qt5_tool +++ b/bin/qt5_tool @@ -3,8 +3,8 @@ # # Helper script for Qt 5 # -# Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -# Contact: http://www.qt-project.org/ +# Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +# Contact: http://www.qt-project.org/legal # #################################################################################################### diff --git a/git-hooks/gerrit-bot b/git-hooks/gerrit-bot index 26ac7411e3ca510b0ec0a16342bd00c261585dd2..c3f16458e325c33512a213e697013813f73d9ce9 100755 --- a/git-hooks/gerrit-bot +++ b/git-hooks/gerrit-bot @@ -1,7 +1,7 @@ #! /usr/bin/perl -# Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -# Contact: http://www.qt-project.org/ +# Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +# Contact: http://www.qt-project.org/legal # # You may use this file under the terms of the 3-clause BSD license. # See the file LICENSE from this package for details. diff --git a/git-hooks/gerrit-bot-cleanup b/git-hooks/gerrit-bot-cleanup index 12164182c6a0d63cc50e5c7749157df19b8a00c7..b993f32decd55a3e40e2db175c2133092816a83c 100755 --- a/git-hooks/gerrit-bot-cleanup +++ b/git-hooks/gerrit-bot-cleanup @@ -1,7 +1,7 @@ #! /bin/sh -# Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -# Contact: http://www.qt-project.org/ +# Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +# Contact: http://www.qt-project.org/legal # # You may use this file under the terms of the 3-clause BSD license. # See the file LICENSE from this package for details. diff --git a/git-hooks/git_post_commit_hook b/git-hooks/git_post_commit_hook index 5090c75f3cb072472aaf6c6e6b8ca3f689ff7ce2..49201ec6c6e173e7657c65b68ce15f6daf41e5a5 100755 --- a/git-hooks/git_post_commit_hook +++ b/git-hooks/git_post_commit_hook @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -# Contact: http://www.qt-project.org/ +# Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +# Contact: http://www.qt-project.org/legal # # You may use this file under the terms of the 3-clause BSD license. # See the file LICENSE from this package for details. diff --git a/git-hooks/sanitize-commit b/git-hooks/sanitize-commit index 3c85f7dad6399809ee71c8ad1ed672a215d40885..0cbb54b521bbfdb769b14d2fd04e9e8f472492e7 100755 --- a/git-hooks/sanitize-commit +++ b/git-hooks/sanitize-commit @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -# Contact: http://www.qt-project.org/ +# Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +# Contact: http://www.qt-project.org/legal # # You may use this file under the terms of the 3-clause BSD license. # See the file LICENSE from this package for details. diff --git a/util/fixnonlatin1/main.cpp b/util/fixnonlatin1/main.cpp index 32cf13ae3b008f42416c0303097dd34de8db8c44..cba65c1ca2d77edf2e51909a30c3fc94df487549 100644 --- a/util/fixnonlatin1/main.cpp +++ b/util/fixnonlatin1/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 utils of the Qt Toolkit. **