diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-23 11:24:04 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-23 11:24:07 +0100 |
| commit | d34353a065c443aac20376cbd88323480d769183 (patch) | |
| tree | da5d86b51c2cf7023356551c4c980849b35bab14 /src/tools/moc | |
| parent | 4e40b1952695f0b1086ef7b88e8514bd18cf96bf (diff) | |
| parent | 571908f7fc8f5e4ef9a4dfd90102566f6f0fcad2 (diff) | |
Merge dev into 5.5
Change-Id: Id6dbbbfc542c214fe695c6795c6aaf23aedc1cd1
Diffstat (limited to 'src/tools/moc')
| -rwxr-xr-x | src/tools/moc/util/generate.sh | 2 | ||||
| -rw-r--r-- | src/tools/moc/util/licenseheader.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/moc/util/generate.sh b/src/tools/moc/util/generate.sh index 40677b42bd..0b1e8d6ebb 100755 --- a/src/tools/moc/util/generate.sh +++ b/src/tools/moc/util/generate.sh @@ -1,7 +1,7 @@ #!/bin/sh ############################################################################# ## -## Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies). +## Copyright (C) 2015 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is the build configuration utility of the Qt Toolkit. diff --git a/src/tools/moc/util/licenseheader.txt b/src/tools/moc/util/licenseheader.txt index e5deadc7df..75cc5f6607 100644 --- a/src/tools/moc/util/licenseheader.txt +++ b/src/tools/moc/util/licenseheader.txt @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies). +** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. |