diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-23 12:09:30 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-24 11:13:09 +0200 |
| commit | 15dd1b7883f5dbe66266aeb588381f85f3532ab9 (patch) | |
| tree | 1fa8caa8ec0f38aef39bcf920e3d5c7efeae5cb9 /tools | |
| parent | f82c4de515223574bcc510de0d993426b22bccbe (diff) | |
| parent | ebceda0cad6d86f6d6fe5efbf85a3b06fb4222b0 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/qml/qml/qqmlimport.cpp
src/qml/qml/qqmlimport_p.h
src/qml/qml/qqmltypenamecache.cpp
Done-with: Ulf Hermann<ulf.hermann@qt.io>
Change-Id: I41ba7a592b2659ddf53da6952ea3b456a7bba319
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 |