diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-11-08 10:28:30 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-11-08 12:32:01 +0100 |
| commit | 0a27a14ec1879096e5fffca75b3bd107b813db87 (patch) | |
| tree | 2e4332c9545af969903cb9c8bd619f2adc53f5a8 /tools | |
| parent | b853a1e1b003d4dc01884201c09c2fcbf75f2cf6 (diff) | |
| parent | 7bedd55551fbe95355b0db11f9d576924e829f9d (diff) | |
Merge remote-tracking branch 'origin/dev' into new-backend
Change-Id: I1a49b4a242ed0764101521d06ec612e96bff0e4c
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qml/conf/configuration.qml | 16 | ||||
| -rw-r--r-- | tools/qml/conf/qtquick.qml | 16 |
2 files changed, 26 insertions, 6 deletions
diff --git a/tools/qml/conf/configuration.qml b/tools/qml/conf/configuration.qml index b50a7f34b2..e12fa39a3e 100644 --- a/tools/qml/conf/configuration.qml +++ b/tools/qml/conf/configuration.qml @@ -1,12 +1,22 @@ /***************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtQuick module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: ** ** "Redistribution and use in source and binary forms, with or without ** modification, are permitted provided that the following conditions are diff --git a/tools/qml/conf/qtquick.qml b/tools/qml/conf/qtquick.qml index a9b28ffd56..ef7a46eb2f 100644 --- a/tools/qml/conf/qtquick.qml +++ b/tools/qml/conf/qtquick.qml @@ -1,12 +1,22 @@ /***************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtQuick module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: ** ** "Redistribution and use in source and binary forms, with or without ** modification, are permitted provided that the following conditions are |