diff options
author | Liang Qi <liang.qi@qt.io> | 2017-11-15 09:11:09 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-11-15 09:11:09 +0100 |
commit | e6eb6ab12daf76f3e716c0d51ceecdab61e39e48 (patch) | |
tree | e7f5751ce4dbf7b696c82a13a0675904a909ca30 | |
parent | fee8674500d829898a4347e2ea77690e04b11b22 (diff) | |
parent | c10eaf9148ec111c3fb752cc15e854e5c7fd3ea7 (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.0
Change-Id: I0825d6b95aaed14230b0677531b1d6e79cf55db8
-rw-r--r-- | examples/remoteobjects/clientapp/qml/plugins.qml | 12 | ||||
-rw-r--r-- | examples/remoteobjects/clientapp/qml/plugins0.qml | 12 | ||||
-rw-r--r-- | examples/remoteobjects/clientapp/qml/plugins1.qml | 12 | ||||
-rw-r--r-- | examples/remoteobjects/clientapp/qml/plugins2.qml | 12 | ||||
-rw-r--r-- | examples/remoteobjects/plugins/imports/TimeExample/Clock.qml | 12 | ||||
-rw-r--r-- | examples/remoteobjects/plugins/plugins.qml | 12 | ||||
-rw-r--r-- | examples/remoteobjects/plugins/plugins0.qml | 12 | ||||
-rw-r--r-- | examples/remoteobjects/plugins/plugins1.qml | 12 | ||||
-rw-r--r-- | examples/remoteobjects/plugins/plugins2.qml | 12 | ||||
-rw-r--r-- | examples/remoteobjects/qmlmodelviewclient/main.qml | 12 |
10 files changed, 110 insertions, 10 deletions
diff --git a/examples/remoteobjects/clientapp/qml/plugins.qml b/examples/remoteobjects/clientapp/qml/plugins.qml index 7f7a3f3..fe5a5a6 100644 --- a/examples/remoteobjects/clientapp/qml/plugins.qml +++ b/examples/remoteobjects/clientapp/qml/plugins.qml @@ -6,7 +6,17 @@ ** This file is part of the QtRemoteObjects 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/examples/remoteobjects/clientapp/qml/plugins0.qml b/examples/remoteobjects/clientapp/qml/plugins0.qml index 3ae39ea..873225e 100644 --- a/examples/remoteobjects/clientapp/qml/plugins0.qml +++ b/examples/remoteobjects/clientapp/qml/plugins0.qml @@ -6,7 +6,17 @@ ** This file is part of the QtRemoteObjects 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/examples/remoteobjects/clientapp/qml/plugins1.qml b/examples/remoteobjects/clientapp/qml/plugins1.qml index 3982991..c1d15ab 100644 --- a/examples/remoteobjects/clientapp/qml/plugins1.qml +++ b/examples/remoteobjects/clientapp/qml/plugins1.qml @@ -6,7 +6,17 @@ ** This file is part of the QtRemoteObjects 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/examples/remoteobjects/clientapp/qml/plugins2.qml b/examples/remoteobjects/clientapp/qml/plugins2.qml index 3538f37..f4eaf94 100644 --- a/examples/remoteobjects/clientapp/qml/plugins2.qml +++ b/examples/remoteobjects/clientapp/qml/plugins2.qml @@ -6,7 +6,17 @@ ** This file is part of the QtRemoteObjects 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/examples/remoteobjects/plugins/imports/TimeExample/Clock.qml b/examples/remoteobjects/plugins/imports/TimeExample/Clock.qml index 8576b60..8c83e70 100644 --- a/examples/remoteobjects/plugins/imports/TimeExample/Clock.qml +++ b/examples/remoteobjects/plugins/imports/TimeExample/Clock.qml @@ -6,7 +6,17 @@ ** This file is part of the QtRemoteObjects 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/examples/remoteobjects/plugins/plugins.qml b/examples/remoteobjects/plugins/plugins.qml index beea953..0f3f9d3 100644 --- a/examples/remoteobjects/plugins/plugins.qml +++ b/examples/remoteobjects/plugins/plugins.qml @@ -6,7 +6,17 @@ ** This file is part of the QtRemoteObjects 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/examples/remoteobjects/plugins/plugins0.qml b/examples/remoteobjects/plugins/plugins0.qml index 3ae39ea..873225e 100644 --- a/examples/remoteobjects/plugins/plugins0.qml +++ b/examples/remoteobjects/plugins/plugins0.qml @@ -6,7 +6,17 @@ ** This file is part of the QtRemoteObjects 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/examples/remoteobjects/plugins/plugins1.qml b/examples/remoteobjects/plugins/plugins1.qml index 3982991..c1d15ab 100644 --- a/examples/remoteobjects/plugins/plugins1.qml +++ b/examples/remoteobjects/plugins/plugins1.qml @@ -6,7 +6,17 @@ ** This file is part of the QtRemoteObjects 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/examples/remoteobjects/plugins/plugins2.qml b/examples/remoteobjects/plugins/plugins2.qml index 3538f37..f4eaf94 100644 --- a/examples/remoteobjects/plugins/plugins2.qml +++ b/examples/remoteobjects/plugins/plugins2.qml @@ -6,7 +6,17 @@ ** This file is part of the QtRemoteObjects 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/examples/remoteobjects/qmlmodelviewclient/main.qml b/examples/remoteobjects/qmlmodelviewclient/main.qml index ca7c943..f1926df 100644 --- a/examples/remoteobjects/qmlmodelviewclient/main.qml +++ b/examples/remoteobjects/qmlmodelviewclient/main.qml @@ -6,7 +6,17 @@ ** This file is part of the QtRemoteObjects 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 |