diff options
| author | Liang Qi <[email protected]> | 2017-10-30 08:45:06 +0100 |
|---|---|---|
| committer | Liang Qi <[email protected]> | 2017-10-30 09:17:43 +0100 |
| commit | 1320f7f9840e94db66988f2dce265dfd373add27 (patch) | |
| tree | 59d191178b86522b19fff44c592ac905326d86b1 /examples/quickcontrols | |
| parent | b2922baedd8b6a2aa1e6aa49a28e774e331c2be9 (diff) | |
| parent | 296810ea4bb4f734881a517eb101e5b948c1905b (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4
Conflicts:
.qmake.conf
Change-Id: Ia33462a31303ae79f7a6ef26dc6065a0afeef3e1
Diffstat (limited to 'examples/quickcontrols')
| -rw-r--r-- | examples/quickcontrols/controls/basiclayouts/main.qml | 16 | ||||
| -rw-r--r-- | examples/quickcontrols/controls/touch/src/main.cpp | 16 |
2 files changed, 26 insertions, 6 deletions
diff --git a/examples/quickcontrols/controls/basiclayouts/main.qml b/examples/quickcontrols/controls/basiclayouts/main.qml index b6694b454..cc4c0d4fe 100644 --- a/examples/quickcontrols/controls/basiclayouts/main.qml +++ b/examples/quickcontrols/controls/basiclayouts/main.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 examples 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/quickcontrols/controls/touch/src/main.cpp b/examples/quickcontrols/controls/touch/src/main.cpp index e66387f7b..be01f2873 100644 --- a/examples/quickcontrols/controls/touch/src/main.cpp +++ b/examples/quickcontrols/controls/touch/src/main.cpp @@ -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 examples 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 |