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/collidingmice | |
| 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/collidingmice')
| -rw-r--r-- | examples/collidingmice/collidingmice.qbs | 2 | ||||
| -rw-r--r-- | examples/collidingmice/main.cpp | 2 | ||||
| -rw-r--r-- | examples/collidingmice/mouse.cpp | 2 | ||||
| -rw-r--r-- | examples/collidingmice/mouse.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/examples/collidingmice/collidingmice.qbs b/examples/collidingmice/collidingmice.qbs index 8d4edd04e..9be12f53e 100644 --- a/examples/collidingmice/collidingmice.qbs +++ b/examples/collidingmice/collidingmice.qbs @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** 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/collidingmice/main.cpp b/examples/collidingmice/main.cpp index 0abfc6899..3873be610 100644 --- a/examples/collidingmice/main.cpp +++ b/examples/collidingmice/main.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** 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/collidingmice/mouse.cpp b/examples/collidingmice/mouse.cpp index dd20409b8..49a829f87 100644 --- a/examples/collidingmice/mouse.cpp +++ b/examples/collidingmice/mouse.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** 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/collidingmice/mouse.h b/examples/collidingmice/mouse.h index 41c02c98f..c8a0948de 100644 --- a/examples/collidingmice/mouse.h +++ b/examples/collidingmice/mouse.h @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** 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 |