diff options
author | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:17:46 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-11-24 11:34:24 +0100 |
commit | db8572ea4b2384611c37dd61956377828fe84202 (patch) | |
tree | bdb0c6fd2b8b8d14897b34ee9c55cc83eef2ef7a /examples | |
parent | 930c4eafe591c7848163cbff4f72020f4a77d579 (diff) | |
parent | e6eb6ab12daf76f3e716c0d51ceecdab61e39e48 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/remoteobjects/qremoteobjectabstractitemmodeladapter_p.h
src/remoteobjects/qremoteobjectdynamicreplica.cpp
src/remoteobjects/qremoteobjectnode_p.h
src/remoteobjects/qremoteobjectregistry.cpp
tests/auto/auto.pro
tools/repc/repcodegenerator.cpp
Done-with: BogDan Vatra <bogdan@kdab.com>
Change-Id: I9d0230736b768eac44b06376aeaab1b0b09eb22a
Diffstat (limited to 'examples')
-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 |