diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2016-06-08 12:25:00 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2016-06-08 12:25:00 +0200 |
| commit | 505cadeb2a072216b904d8655f5e6e62b0f9380b (patch) | |
| tree | 36a771df1107eb6c5edd3304f22fdfc3361895eb /examples/cocoa-application | |
| parent | daf715d9cae1c297ea50587c9e40c0f24bd59a07 (diff) | |
| parent | a98416dcf9895ad6f840a0e35da10a667a8a20ae (diff) | |
Merge remote-tracking branch 'origin/1.5'
Conflicts:
doc/reference/items/transformer.qdoc
share/qbs/modules/cpp/GenericGCC.qbs
Change-Id: I45560834560019b18274c373c45651eb8aadd206
Diffstat (limited to 'examples/cocoa-application')
5 files changed, 5 insertions, 5 deletions
diff --git a/examples/cocoa-application/CocoaApplication.qbs b/examples/cocoa-application/CocoaApplication.qbs index 3a86dba48..a04acfb6b 100644 --- a/examples/cocoa-application/CocoaApplication.qbs +++ b/examples/cocoa-application/CocoaApplication.qbs @@ -4,7 +4,7 @@ ** Copyright (C) 2015 Petroules Corporation. ** Contact: http://www.qt.io/licensing ** -** This file is part of the examples of the Qt Build Suite. +** This file is part of the examples of Qbs. ** ** You may use this file under the terms of the BSD license as follows: ** diff --git a/examples/cocoa-application/CocoaApplication/AppDelegate.h b/examples/cocoa-application/CocoaApplication/AppDelegate.h index 75f193469..a6c715c5b 100644 --- a/examples/cocoa-application/CocoaApplication/AppDelegate.h +++ b/examples/cocoa-application/CocoaApplication/AppDelegate.h @@ -3,7 +3,7 @@ ** Copyright (C) 2015 Petroules Corporation. ** Contact: http://www.qt.io/licensing ** -** This file is part of the Qt Build Suite. +** This file is part of Qbs. ** ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in diff --git a/examples/cocoa-application/CocoaApplication/AppDelegate.m b/examples/cocoa-application/CocoaApplication/AppDelegate.m index a69a96975..8fd5c49c9 100644 --- a/examples/cocoa-application/CocoaApplication/AppDelegate.m +++ b/examples/cocoa-application/CocoaApplication/AppDelegate.m @@ -3,7 +3,7 @@ ** Copyright (C) 2015 Petroules Corporation. ** Contact: http://www.qt.io/licensing ** -** This file is part of the Qt Build Suite. +** This file is part of Qbs. ** ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in diff --git a/examples/cocoa-application/CocoaApplication/CocoaApplication-Prefix.pch b/examples/cocoa-application/CocoaApplication/CocoaApplication-Prefix.pch index af4d61585..d7206045a 100644 --- a/examples/cocoa-application/CocoaApplication/CocoaApplication-Prefix.pch +++ b/examples/cocoa-application/CocoaApplication/CocoaApplication-Prefix.pch @@ -3,7 +3,7 @@ ** Copyright (C) 2015 Petroules Corporation. ** Contact: http://www.qt.io/licensing ** -** This file is part of the Qt Build Suite. +** This file is part of Qbs. ** ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in diff --git a/examples/cocoa-application/CocoaApplication/main.m b/examples/cocoa-application/CocoaApplication/main.m index 6150f272e..18b23e7ad 100644 --- a/examples/cocoa-application/CocoaApplication/main.m +++ b/examples/cocoa-application/CocoaApplication/main.m @@ -3,7 +3,7 @@ ** Copyright (C) 2015 Petroules Corporation. ** Contact: http://www.qt.io/licensing ** -** This file is part of the Qt Build Suite. +** This file is part of Qbs. ** ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in |