diff options
author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:07:44 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 13:52:32 +0200 |
commit | e6c944939f88afe852d2d0a604fd9815c409f2eb (patch) | |
tree | 644736aa8a6235dd1db6e1cef18ee1aec28439da /examples/wayland/spanning-screens/main.qml | |
parent | dbf418dce41fe08368d38a098a771348a5b3d0fd (diff) | |
parent | 4934b87156a889584a34e36c22abd9aee64cef7e (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
src/client/qwaylandwindow.cpp
Change-Id: I3ae070ff20df4b858a4eef769438092c061e47ef
Diffstat (limited to 'examples/wayland/spanning-screens/main.qml')
-rw-r--r-- | examples/wayland/spanning-screens/main.qml | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/examples/wayland/spanning-screens/main.qml b/examples/wayland/spanning-screens/main.qml index ef3e70ac9..c978f589e 100644 --- a/examples/wayland/spanning-screens/main.qml +++ b/examples/wayland/spanning-screens/main.qml @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt-project.org/legal ** ** 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 |