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/app/config-ui | |
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/app/config-ui')
-rw-r--r-- | src/app/config-ui/commandlineparser.cpp | 2 | ||||
-rw-r--r-- | src/app/config-ui/commandlineparser.h | 2 | ||||
-rw-r--r-- | src/app/config-ui/fgapp.mm | 2 | ||||
-rw-r--r-- | src/app/config-ui/main.cpp | 2 | ||||
-rw-r--r-- | src/app/config-ui/mainwindow.cpp | 2 | ||||
-rw-r--r-- | src/app/config-ui/mainwindow.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/src/app/config-ui/commandlineparser.cpp b/src/app/config-ui/commandlineparser.cpp index 6b4c2d2fe..3f5c8f17a 100644 --- a/src/app/config-ui/commandlineparser.cpp +++ b/src/app/config-ui/commandlineparser.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/src/app/config-ui/commandlineparser.h b/src/app/config-ui/commandlineparser.h index 91e0ab2a3..7cc357340 100644 --- a/src/app/config-ui/commandlineparser.h +++ b/src/app/config-ui/commandlineparser.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 diff --git a/src/app/config-ui/fgapp.mm b/src/app/config-ui/fgapp.mm index 039256a3e..ce3f6e0fe 100644 --- a/src/app/config-ui/fgapp.mm +++ b/src/app/config-ui/fgapp.mm @@ -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/app/config-ui/main.cpp b/src/app/config-ui/main.cpp index 52426cac1..e5c0876b7 100644 --- a/src/app/config-ui/main.cpp +++ b/src/app/config-ui/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/src/app/config-ui/mainwindow.cpp b/src/app/config-ui/mainwindow.cpp index 07143f96e..2a3627e2f 100644 --- a/src/app/config-ui/mainwindow.cpp +++ b/src/app/config-ui/mainwindow.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/src/app/config-ui/mainwindow.h b/src/app/config-ui/mainwindow.h index 2f5c6306f..8c6f1d43c 100644 --- a/src/app/config-ui/mainwindow.h +++ b/src/app/config-ui/mainwindow.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 |