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 /tests/auto/api/testdata/transformers | |
| 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 'tests/auto/api/testdata/transformers')
| -rw-r--r-- | tests/auto/api/testdata/transformers/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/api/testdata/transformers/main.cpp b/tests/auto/api/testdata/transformers/main.cpp index 52606e760..07a841b10 100644 --- a/tests/auto/api/testdata/transformers/main.cpp +++ b/tests/auto/api/testdata/transformers/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 |