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 /src/lib/qtprofilesetup/templates | |
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 'src/lib/qtprofilesetup/templates')
-rw-r--r-- | src/lib/qtprofilesetup/templates/dbus.js | 2 | ||||
-rw-r--r-- | src/lib/qtprofilesetup/templates/moc.js | 2 | ||||
-rw-r--r-- | src/lib/qtprofilesetup/templates/qdoc.js | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/qtprofilesetup/templates/dbus.js b/src/lib/qtprofilesetup/templates/dbus.js index 86f43e712..01ef8115f 100644 --- a/src/lib/qtprofilesetup/templates/dbus.js +++ b/src/lib/qtprofilesetup/templates/dbus.js @@ -3,7 +3,7 @@ ** Copyright (C) 2016 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/src/lib/qtprofilesetup/templates/moc.js b/src/lib/qtprofilesetup/templates/moc.js index 5459cf536..6c4d74f27 100644 --- a/src/lib/qtprofilesetup/templates/moc.js +++ b/src/lib/qtprofilesetup/templates/moc.js @@ -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/src/lib/qtprofilesetup/templates/qdoc.js b/src/lib/qtprofilesetup/templates/qdoc.js index 0e37e259e..868403467 100644 --- a/src/lib/qtprofilesetup/templates/qdoc.js +++ b/src/lib/qtprofilesetup/templates/qdoc.js @@ -4,7 +4,7 @@ ** Copyright (C) 2015 Jake Petroules. ** 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 |